Skip to content

Commit

Permalink
psycoprg: make Range generic
Browse files Browse the repository at this point in the history
And some other small fixes
  • Loading branch information
hamdanal committed Feb 17, 2024
1 parent 504cbd4 commit 9fdf5d3
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 27 deletions.
1 change: 0 additions & 1 deletion stubs/psycopg2/@tests/stubtest_allowlist.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
psycopg2.pool.AbstractConnectionPool.(closeall|getconn|putconn)
psycopg2.(extras|_range).RangeAdapter.name
psycopg2.(_psycopg|extensions).connection.async # async is a reserved keyword
57 changes: 31 additions & 26 deletions stubs/psycopg2/psycopg2/_range.pyi
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
from _typeshed import Incomplete
from typing import Any, overload
import datetime as dt
from _typeshed import SupportsAllComparisons
from typing import Any, Generic, TypeVar, overload
from typing_extensions import Self

from psycopg2._psycopg import connection, cursor
from psycopg2._psycopg import _type, connection, cursor

class Range:
_T_co = TypeVar("_T_co", covariant=True)

class Range(Generic[_T_co]):
def __init__(
self, lower: Incomplete | None = None, upper: Incomplete | None = None, bounds: str = "[)", empty: bool = False
self, lower: _T_co | None = None, upper: _T_co | None = None, bounds: str = "[)", empty: bool = False
) -> None: ...
@property
def lower(self): ...
def lower(self) -> _T_co | None: ...
@property
def upper(self): ...
def upper(self) -> _T_co | None: ...
@property
def isempty(self) -> bool: ...
@property
Expand All @@ -22,51 +25,53 @@ class Range:
def lower_inc(self) -> bool: ...
@property
def upper_inc(self) -> bool: ...
def __contains__(self, x) -> bool: ...
def __contains__(self, x: SupportsAllComparisons) -> bool: ...
def __bool__(self) -> bool: ...
def __eq__(self, other: object) -> bool: ...
def __ne__(self, other: object) -> bool: ...
def __hash__(self) -> int: ...
def __lt__(self, other: Range) -> bool: ...
def __le__(self, other: Range) -> bool: ...
def __gt__(self, other: Range) -> bool: ...
def __ge__(self, other: Range) -> bool: ...
def __lt__(self, other: Range[_T_co]) -> bool: ...
def __le__(self, other: Range[_T_co]) -> bool: ...
def __gt__(self, other: Range[_T_co]) -> bool: ...
def __ge__(self, other: Range[_T_co]) -> bool: ...

def register_range(
pgrange: str, pyrange: str | type[Range], conn_or_curs: connection | cursor, globally: bool = False
pgrange: str, pyrange: str | type[Range[Any]], conn_or_curs: connection | cursor, globally: bool = False
) -> RangeCaster: ...

class RangeAdapter:
name: str # this is None here but MUST be str in subclasses
adapted: Range
def __init__(self, adapted: Range) -> None: ...
name: str | None = None
adapted: Range[Any]
def __init__(self, adapted: Range[Any]) -> None: ...
def __conform__(self, proto) -> Self | None: ...
def prepare(self, conn: connection | None) -> None: ...
def getquoted(self) -> bytes: ...

class RangeCaster:
adapter: type[RangeAdapter]
range: type[Range]
subtype_oid: Any
typecaster: Any
array_typecaster: Any
range: type[Range[Any]]
subtype_oid: int
typecaster: _type
array_typecaster: _type | None
def __init__(
self,
pgrange: str | type[RangeAdapter],
pyrange: str | type[Range],
pyrange: str | type[Range[Any]],
oid: int,
subtype_oid: int,
array_oid: int | None = None,
) -> None: ...
@overload
def parse(self, s: None, cur: cursor | None = None) -> None: ...
@overload
def parse(self, s: str, cur: cursor | None = None) -> Range: ...
def parse(self, s: str, cur: cursor | None = None) -> Range[Any]: ...
@overload
def parse(self, s: str | None, cur: cursor | None = None) -> Range[Any] | None: ...

class NumericRange(Range): ...
class DateRange(Range): ...
class DateTimeRange(Range): ...
class DateTimeTZRange(Range): ...
class NumericRange(Range[float]): ...
class DateRange(Range[dt.date]): ...
class DateTimeRange(Range[dt.datetime]): ...
class DateTimeTZRange(Range[dt.datetime]): ...

class NumberRangeAdapter(RangeAdapter):
def getquoted(self) -> bytes: ...
Expand Down

0 comments on commit 9fdf5d3

Please sign in to comment.