Dropped utils.typing in favour of proto package

diff --git a/psycopg3/_psycopg3.pyi b/psycopg3/_psycopg3.pyi
index fd19c4d48d0c9081a93cae9a77abd04d7a7b2c30..10eb17cdecb8d55ea9b843750bfa2d20d94ccad8 100644 (file)
--- a/psycopg3/_psycopg3.pyi
+++ b/psycopg3/_psycopg3.pyi
@@ -10,9 +10,9 @@ information. Will submit a bug.
 import codecs
 from typing import Any, Iterable, List, Optional, Sequence, Tuple
 
+from .proto import AdaptContext, DumpFunc, DumpersMap, DumperType
+from .proto import LoadFunc, LoadersMap, LoaderType, MaybeOid
 from .connection import BaseConnection
-from .utils.typing import AdaptContext, DumpFunc, DumpersMap, DumperType
-from .utils.typing import LoadFunc, LoadersMap, LoaderType, MaybeOid
 from . import pq
 
 Format = pq.Format

diff --git a/psycopg3/adapt.py b/psycopg3/adapt.py
index 24500ee0547de37b8197f82cae9e080595666142..cd97715b108565b4d7daa33dcd05ea38637d0651 100644 (file)
--- a/psycopg3/adapt.py
+++ b/psycopg3/adapt.py
@@ -8,10 +8,10 @@ from typing import Any, Callable, Optional, Tuple, Type, Union
 
 from . import pq
 from . import proto
+from .proto import AdaptContext, DumpersMap, DumperType
+from .proto import LoadersMap, LoaderType
 from .cursor import BaseCursor
 from .connection import BaseConnection
-from .utils.typing import AdaptContext, DumpersMap, DumperType
-from .utils.typing import LoadersMap, LoaderType
 
 # Part of the module interface (just importing it makes mypy unhappy)
 Format = pq.Format

diff --git a/psycopg3/connection.py b/psycopg3/connection.py
index f0556b36eb8d616ff858cf682873bc75ba8ff82b..437b7015cecbddc797323e4ef12ea241f6843a2e 100644 (file)
--- a/psycopg3/connection.py
+++ b/psycopg3/connection.py
@@ -15,9 +15,9 @@ from . import pq
 from . import errors as e
 from . import cursor
 from . import generators
+from . import proto
 from .conninfo import make_conninfo
 from .waiting import wait, wait_async
-from .utils.typing import DumpersMap, LoadersMap
 
 logger = logging.getLogger(__name__)
 
@@ -52,8 +52,8 @@ class BaseConnection:
     def __init__(self, pgconn: pq.proto.PGconn):
         self.pgconn = pgconn
         self.cursor_factory = cursor.BaseCursor
-        self.dumpers: DumpersMap = {}
-        self.loaders: LoadersMap = {}
+        self.dumpers: proto.DumpersMap = {}
+        self.loaders: proto.LoadersMap = {}
         # name of the postgres encoding (in bytes)
         self._pgenc = b""
 

diff --git a/psycopg3/cursor.py b/psycopg3/cursor.py
index a48171896c3a27db00d13e42dc34627aba4c655b..9f9efd605816b155c95582d94e38aadf3ff0daff 100644 (file)
--- a/psycopg3/cursor.py
+++ b/psycopg3/cursor.py
@@ -12,8 +12,8 @@ from . import errors as e
 from . import pq
 from . import generators
 from . import proto
+from .proto import Query, Params, DumpersMap, LoadersMap
 from .utils.queries import PostgresQuery
-from .utils.typing import Query, Params, DumpersMap, LoadersMap
 
 if TYPE_CHECKING:
     from .connection import BaseConnection, Connection, AsyncConnection

diff --git a/psycopg3/proto.py b/psycopg3/proto.py
index 9db962b526f920167725e6ac0d97db4c2d720863..7e92a276542a207a9dbbb22e01220b9606b067bf 100644 (file)
--- a/psycopg3/proto.py
+++ b/psycopg3/proto.py
@@ -5,20 +5,39 @@ Protocol objects representing different implementations of the same classes.
 # Copyright (C) 2020 The Psycopg Team
 
 import codecs
-from typing import Any, Iterable, List, Optional, Sequence, Tuple
-from typing import TYPE_CHECKING
+from typing import Any, Callable, Dict, Iterable, List, Mapping, Optional
+from typing import Sequence, Tuple, Type, Union, TYPE_CHECKING
 from typing_extensions import Protocol
 
-from .utils.typing import AdaptContext, DumpFunc, DumpersMap, DumperType
-from .utils.typing import LoadFunc, LoadersMap, LoaderType, MaybeOid
 from . import pq
 
 if TYPE_CHECKING:
     from .connection import BaseConnection  # noqa
+    from .cursor import BaseCursor  # noqa
+    from .adapt import Dumper, Loader  # noqa
 
+# Part of the module interface (just importing it makes mypy unhappy)
 Format = pq.Format
 
 
+EncodeFunc = Callable[[str], Tuple[bytes, int]]
+DecodeFunc = Callable[[bytes], Tuple[str, int]]
+
+Query = Union[str, bytes]
+Params = Union[Sequence[Any], Mapping[str, Any]]
+
+AdaptContext = Union[None, "BaseConnection", "BaseCursor", "Transformer"]
+
+MaybeOid = Union[Optional[bytes], Tuple[Optional[bytes], int]]
+DumpFunc = Callable[[Any], MaybeOid]
+DumperType = Union[Type["Dumper"], DumpFunc]
+DumpersMap = Dict[Tuple[type, Format], DumperType]
+
+LoadFunc = Callable[[bytes], Any]
+LoaderType = Union[Type["Loader"], LoadFunc]
+LoadersMap = Dict[Tuple[int, Format], LoaderType]
+
+
 class Transformer(Protocol):
     def __init__(self, context: AdaptContext = None):
         ...

diff --git a/psycopg3/transform.py b/psycopg3/transform.py
index d5bb41d49bb3fb564ca1d31fc571faba675fff68..6ef1fca49463cdd7bdc6def18fbea7615ea588c2 100644 (file)
--- a/psycopg3/transform.py
+++ b/psycopg3/transform.py
@@ -9,11 +9,11 @@ from typing import Any, Dict, Iterable, List, Optional, Sequence, Tuple
 
 from . import errors as e
 from . import pq
+from .proto import AdaptContext, DumpFunc, DumpersMap, DumperType
+from .proto import LoadFunc, LoadersMap, LoaderType, MaybeOid
 from .cursor import BaseCursor
-from .types.oids import builtins, INVALID_OID
 from .connection import BaseConnection
-from .utils.typing import AdaptContext, DumpFunc, DumpersMap, DumperType
-from .utils.typing import LoadFunc, LoadersMap, LoaderType, MaybeOid
+from .types.oids import builtins, INVALID_OID
 
 Format = pq.Format
 TEXT_OID = builtins["text"].oid

diff --git a/psycopg3/types/array.py b/psycopg3/types/array.py
index a7cf7b34c22e37bee8059d4f0e2cfa20891c872a..02bd13835012b2c1ee15cb374c4d7dfb67f7c346 100644 (file)
--- a/psycopg3/types/array.py
+++ b/psycopg3/types/array.py
@@ -10,8 +10,8 @@ from typing import Any, Generator, List, Optional, Tuple
 
 from .. import errors as e
 from ..adapt import Format, Dumper, Loader, Transformer
+from ..proto import AdaptContext
 from .oids import builtins
-from ..utils.typing import AdaptContext
 
 TEXT_OID = builtins["text"].oid
 TEXT_ARRAY_OID = builtins["text"].array_oid

diff --git a/psycopg3/types/composite.py b/psycopg3/types/composite.py
index 51cc2111b74b7d7c8ad76b2ee741d96f0b3731e1..610912520e1e39891006c48eb36eaa922b3807b6 100644 (file)
--- a/psycopg3/types/composite.py
+++ b/psycopg3/types/composite.py
@@ -10,8 +10,8 @@ from typing import Optional, TYPE_CHECKING
 
 from . import array
 from ..adapt import Format, Dumper, Loader, Transformer
+from ..proto import AdaptContext
 from .oids import builtins, TypeInfo
-from ..utils.typing import AdaptContext
 
 if TYPE_CHECKING:
     from ..connection import Connection, AsyncConnection

diff --git a/psycopg3/types/text.py b/psycopg3/types/text.py
index f770a812abe00fe430d60db0a0fed87eeed037f0..e3ac114b35f181664cfa466c4d6f45f1a93eb980 100644 (file)
--- a/psycopg3/types/text.py
+++ b/psycopg3/types/text.py
@@ -5,15 +5,13 @@ Adapters for textual types.
 # Copyright (C) 2020 The Psycopg Team
 
 import codecs
-from typing import Optional, Tuple, Union, TYPE_CHECKING
+from typing import Optional, Tuple, Union
 
 from ..adapt import Dumper, Loader
-from ..utils.typing import EncodeFunc, DecodeFunc
+from ..proto import AdaptContext, EncodeFunc, DecodeFunc
 from ..pq import Escaping
 from .oids import builtins, INVALID_OID
 
-if TYPE_CHECKING:
-    from ..utils.typing import AdaptContext
 
 TEXT_OID = builtins["text"].oid
 BYTEA_OID = builtins["bytea"].oid
@@ -22,7 +20,7 @@ BYTEA_OID = builtins["bytea"].oid
 @Dumper.text(str)
 @Dumper.binary(str)
 class StringDumper(Dumper):
-    def __init__(self, src: type, context: "AdaptContext"):
+    def __init__(self, src: type, context: AdaptContext):
         super().__init__(src, context)
 
         self._encode: EncodeFunc
@@ -47,7 +45,7 @@ class StringLoader(Loader):
 
     decode: Optional[DecodeFunc]
 
-    def __init__(self, oid: int, context: "AdaptContext"):
+    def __init__(self, oid: int, context: AdaptContext):
         super().__init__(oid, context)
 
         if self.connection is not None:
@@ -71,7 +69,7 @@ class StringLoader(Loader):
 @Loader.text(builtins["bpchar"].oid)
 @Loader.binary(builtins["bpchar"].oid)
 class UnknownLoader(Loader):
-    def __init__(self, oid: int, context: "AdaptContext"):
+    def __init__(self, oid: int, context: AdaptContext):
         super().__init__(oid, context)
 
         self.decode: DecodeFunc
@@ -86,7 +84,7 @@ class UnknownLoader(Loader):
 
 @Dumper.text(bytes)
 class BytesDumper(Dumper):
-    def __init__(self, src: type, context: "AdaptContext" = None):
+    def __init__(self, src: type, context: AdaptContext = None):
         super().__init__(src, context)
         self.esc = Escaping(
             self.connection.pgconn if self.connection is not None else None

diff --git a/psycopg3/utils/queries.py b/psycopg3/utils/queries.py
index c3a9a2356ca0d69f30619ca4eff6259cde819a4b..8179fcf3b98f62d66d1b207c5e7819b3fa01b806 100644 (file)
--- a/psycopg3/utils/queries.py
+++ b/psycopg3/utils/queries.py
@@ -11,7 +11,7 @@ from typing import Sequence, Tuple, Union, TYPE_CHECKING
 
 from .. import errors as e
 from ..pq import Format
-from .typing import Query, Params
+from ..proto import Query, Params
 
 if TYPE_CHECKING:
     from ..proto import Transformer

diff --git a/psycopg3/utils/typing.py b/psycopg3/utils/typing.py
deleted file mode 100644 (file)
index f8c41f1..0000000
--- a/psycopg3/utils/typing.py
+++ /dev/null
@@ -1,37 +0,0 @@
-"""
-Additional types for checking
-"""
-
-# Copyright (C) 2020 The Psycopg Team
-
-from typing import Any, Callable, Dict, Mapping, Optional, Sequence, Tuple
-from typing import Type, Union, TYPE_CHECKING
-
-from .. import pq
-
-if TYPE_CHECKING:
-    from ..connection import BaseConnection  # noqa
-    from ..cursor import BaseCursor  # noqa
-    from ..adapt import Dumper, Loader  # noqa
-    from ..proto import Transformer  # noqa
-
-# Part of the module interface (just importing it makes mypy unhappy)
-Format = pq.Format
-
-
-EncodeFunc = Callable[[str], Tuple[bytes, int]]
-DecodeFunc = Callable[[bytes], Tuple[str, int]]
-
-Query = Union[str, bytes]
-Params = Union[Sequence[Any], Mapping[str, Any]]
-
-AdaptContext = Union[None, "BaseConnection", "BaseCursor", "Transformer"]
-
-MaybeOid = Union[Optional[bytes], Tuple[Optional[bytes], int]]
-DumpFunc = Callable[[Any], MaybeOid]
-DumperType = Union[Type["Dumper"], DumpFunc]
-DumpersMap = Dict[Tuple[type, Format], DumperType]
-
-LoadFunc = Callable[[bytes], Any]
-LoaderType = Union[Type["Loader"], LoadFunc]
-LoadersMap = Dict[Tuple[int, Format], LoaderType]