oids module moved from psycopg3.types to psycog3 package

Importing it from types caused too many side effects.

diff --git a/psycopg3/psycopg3/_transform.py b/psycopg3/psycopg3/_transform.py
index 345b7d8ea55e3b7bed5ceeb271c9582084a73962..70d2f99b768f16e00a92cb0aa4293b53aeabed9b 100644 (file)
--- a/psycopg3/psycopg3/_transform.py
+++ b/psycopg3/psycopg3/_transform.py
@@ -10,11 +10,11 @@ from typing import TYPE_CHECKING
 
 from . import errors as e
 from . import pq
+from .oids import builtins, INVALID_OID
 from .proto import AdaptContext, DumpersMap
 from .proto import LoadFunc, LoadersMap
 from .cursor import BaseCursor
 from .connection import BaseConnection
-from .types.oids import builtins, INVALID_OID
 
 if TYPE_CHECKING:
     from .adapt import Dumper, Loader

diff --git a/psycopg3/psycopg3/adapt.py b/psycopg3/psycopg3/adapt.py
index d84ca0f08e0677ed068f226e9dd48c240b0f3618..5343e32366087d8c70efb6512a8a672c2cbb23af 100644 (file)
--- a/psycopg3/psycopg3/adapt.py
+++ b/psycopg3/psycopg3/adapt.py
@@ -9,7 +9,7 @@ from typing import Any, Callable, Optional, Type
 from . import pq
 from . import proto
 from .pq import Format as Format
-from .types import builtins
+from .oids import builtins
 from .proto import AdaptContext, DumpersMap, DumperType, LoadersMap, LoaderType
 from .cursor import BaseCursor
 from .connection import BaseConnection

diff --git a/psycopg3/psycopg3/cursor.py b/psycopg3/psycopg3/cursor.py
index b21eca483c5a508d64be244eb62565559162d46f..68c5c87fc32e297252ba053d2ccfef31740ab4db 100644 (file)
--- a/psycopg3/psycopg3/cursor.py
+++ b/psycopg3/psycopg3/cursor.py
@@ -11,9 +11,10 @@ from operator import attrgetter
 from . import errors as e
 from . import pq
 from . import proto
+from .oids import builtins
+from .copy import Copy, AsyncCopy
 from .proto import Query, Params, DumpersMap, LoadersMap, PQGen
 from .utils.queries import PostgresQuery
-from .copy import Copy, AsyncCopy
 
 if TYPE_CHECKING:
     from .connection import BaseConnection, Connection, AsyncConnection

diff --git a/psycopg3/psycopg3/dbapi20.py b/psycopg3/psycopg3/dbapi20.py
index 30d17acc4cce9ac91fabe578b3b7219dba21b60d..7e883ba419c2b4e3dae8d1afe69bf4e3abd4ea91 100644 (file)
--- a/psycopg3/psycopg3/dbapi20.py
+++ b/psycopg3/psycopg3/dbapi20.py
@@ -9,7 +9,7 @@ import datetime as dt
 from math import floor
 from typing import Any, Sequence
 
-from .types.oids import builtins
+from .oids import builtins
 from .adapt import Dumper
 
 

diff --git a/psycopg3/psycopg3/types/oids.py b/psycopg3/psycopg3/oids.py
similarity index 100%
rename from psycopg3/psycopg3/types/oids.py
rename to psycopg3/psycopg3/oids.py

diff --git a/psycopg3/psycopg3/types/__init__.py b/psycopg3/psycopg3/types/__init__.py
index 7ccda4c7ad453c0afe0fd17d3f0dd58729e845ca..a75bbc40a6aaab63ccc9b0f3a81217723a0fba6a 100644 (file)
--- a/psycopg3/psycopg3/types/__init__.py
+++ b/psycopg3/psycopg3/types/__init__.py
@@ -5,7 +5,7 @@ psycopg3 types package
 # Copyright (C) 2020 The Psycopg Team
 
 
-from .oids import builtins
+from ..oids import builtins
 
 # Register default adapters
 from . import array, composite, date, json, numeric, singletons, text  # noqa

diff --git a/psycopg3/psycopg3/types/array.py b/psycopg3/psycopg3/types/array.py
index 7c8b85804f3ec6bb4a3f8548207be67d8f52652b..fbb79490f912ef98d189d13098c1a19376b13bed 100644 (file)
--- a/psycopg3/psycopg3/types/array.py
+++ b/psycopg3/psycopg3/types/array.py
@@ -9,9 +9,9 @@ import struct
 from typing import Any, Generator, List, Optional, Type
 
 from .. import errors as e
+from ..oids import builtins
 from ..adapt import Format, Dumper, Loader, Transformer
 from ..proto import AdaptContext
-from .oids import builtins
 
 TEXT_OID = builtins["text"].oid
 TEXT_ARRAY_OID = builtins["text"].array_oid

diff --git a/psycopg3/psycopg3/types/composite.py b/psycopg3/psycopg3/types/composite.py
index 97dc1d6390ab0c2dc61655b106b49d7c27d18a66..64e82fc5e2a5cdab576333506e0ab9899943794c 100644 (file)
--- a/psycopg3/psycopg3/types/composite.py
+++ b/psycopg3/psycopg3/types/composite.py
@@ -9,10 +9,10 @@ from typing import Any, Callable, Generator, Sequence, Tuple, Type
 from typing import Optional, TYPE_CHECKING
 
 from .. import pq
+from ..oids import builtins, TypeInfo
 from ..adapt import Format, Dumper, Loader, Transformer
 from ..proto import AdaptContext
 from . import array
-from .oids import builtins, TypeInfo
 
 if TYPE_CHECKING:
     from ..connection import Connection, AsyncConnection

diff --git a/psycopg3/psycopg3/types/date.py b/psycopg3/psycopg3/types/date.py
index eadc031135da25ec42c765cd082d93ce42e18efa..47861903fd9c42359eefc56ae1dc634920a819bb 100644 (file)
--- a/psycopg3/psycopg3/types/date.py
+++ b/psycopg3/psycopg3/types/date.py
@@ -10,10 +10,10 @@ import codecs
 from datetime import date, datetime, time, timedelta
 from typing import cast
 
+from ..oids import builtins
 from ..adapt import Dumper, Loader
 from ..proto import AdaptContext, EncodeFunc, DecodeFunc
 from ..errors import InterfaceError, DataError
-from .oids import builtins
 
 _encode_ascii = codecs.lookup("ascii").encode
 _decode_ascii = codecs.lookup("ascii").decode

diff --git a/psycopg3/psycopg3/types/json.py b/psycopg3/psycopg3/types/json.py
index e202a515655887419da3f970a8020d9bc07978b9..296082b8e1ace098bd1e5ce2c17a8885825da56e 100644 (file)
--- a/psycopg3/psycopg3/types/json.py
+++ b/psycopg3/psycopg3/types/json.py
@@ -8,7 +8,7 @@ import json
 import codecs
 from typing import Any, Callable, Optional
 
-from .oids import builtins
+from ..oids import builtins
 from ..adapt import Dumper, Loader
 from ..proto import EncodeFunc
 from ..errors import DataError

diff --git a/psycopg3/psycopg3/types/numeric.py b/psycopg3/psycopg3/types/numeric.py
index ae2edab47c93b9b23feb72a66fc86a3854d7c04e..50b07e557bceab01313a50d5b02344eb983407ad 100644 (file)
--- a/psycopg3/psycopg3/types/numeric.py
+++ b/psycopg3/psycopg3/types/numeric.py
@@ -9,9 +9,9 @@ import struct
 from typing import Any, Callable, Dict, Tuple, cast
 from decimal import Decimal
 
+from ..oids import builtins
 from ..adapt import Dumper, Loader
 from ..proto import EncodeFunc, DecodeFunc
-from .oids import builtins
 
 UnpackInt = Callable[[bytes], Tuple[int]]
 UnpackFloat = Callable[[bytes], Tuple[float]]

diff --git a/psycopg3/psycopg3/types/singletons.py b/psycopg3/psycopg3/types/singletons.py
index a94a4bb4f12f82965c2540b3c1efa77ef986d3ad..aa39ca42bf4e3353771bdbe7c093ca5b962f0782 100644 (file)
--- a/psycopg3/psycopg3/types/singletons.py
+++ b/psycopg3/psycopg3/types/singletons.py
@@ -6,8 +6,8 @@ Adapters for None and boolean.
 
 from typing import Dict
 
+from ..oids import builtins
 from ..adapt import Dumper, Loader
-from .oids import builtins
 
 BOOL_OID = builtins["bool"].oid
 

diff --git a/psycopg3/psycopg3/types/text.py b/psycopg3/psycopg3/types/text.py
index 19608579858542d5d1c825890c4e447150b4b35b..1c3073cf80577baf6adf805ca35521471b0295ec 100644 (file)
--- a/psycopg3/psycopg3/types/text.py
+++ b/psycopg3/psycopg3/types/text.py
@@ -7,10 +7,10 @@ Adapters for textual types.
 import codecs
 from typing import Optional, Union, TYPE_CHECKING
 
+from ..oids import builtins, INVALID_OID
 from ..adapt import Dumper, Loader
 from ..proto import AdaptContext, EncodeFunc, DecodeFunc
 from ..pq import Escaping
-from .oids import builtins, INVALID_OID
 
 if TYPE_CHECKING:
     from ..pq.proto import Escaping as EscapingProto

diff --git a/psycopg3/psycopg3/types/uuid.py b/psycopg3/psycopg3/types/uuid.py
index fc3b9578d261c14bd5aa73a0e67ff62d1eca61c5..37ff17cae7df8eb1881554ceca8e6fd55546428f 100644 (file)
--- a/psycopg3/psycopg3/types/uuid.py
+++ b/psycopg3/psycopg3/types/uuid.py
@@ -10,9 +10,9 @@ from uuid import UUID
 
 import codecs
 
+from ..oids import builtins
 from ..adapt import Dumper, Loader
 from ..proto import DecodeFunc, EncodeFunc
-from .oids import builtins
 
 _encode_ascii = codecs.lookup("ascii").encode
 _decode_ascii = codecs.lookup("ascii").decode

diff --git a/psycopg3_c/psycopg3_c/types/numeric.pyx b/psycopg3_c/psycopg3_c/types/numeric.pyx
index 4058525b5582fbcfc7ee128f00ce89fc9adc8d56..46150ddbd7288ae4521adde0fdbb43e078725840 100644 (file)
--- a/psycopg3_c/psycopg3_c/types/numeric.pyx
+++ b/psycopg3_c/psycopg3_c/types/numeric.pyx
@@ -48,8 +48,8 @@ cdef class BoolBinaryLoader(CLoader):
 cdef void register_numeric_c_loaders():
     logger.debug("registering optimised numeric c loaders")
 
+    from psycopg3.oids import builtins
     from psycopg3.adapt import Loader
-    from psycopg3.types import builtins
 
     IntLoader.register(builtins["int2"].oid)
     IntLoader.register(builtins["int4"].oid)

diff --git a/psycopg3_c/psycopg3_c/types/text.pyx b/psycopg3_c/psycopg3_c/types/text.pyx
index a8c2c90304b6eb25073f18cff95463a4d9a7fefa..a7f6f6f76850b7b868d81e4bd51c5a92dffcce46 100644 (file)
--- a/psycopg3_c/psycopg3_c/types/text.pyx
+++ b/psycopg3_c/psycopg3_c/types/text.pyx
@@ -61,8 +61,8 @@ cdef class ByteaBinaryLoader(CLoader):
 cdef void register_text_c_loaders():
     logger.debug("registering optimised text c loaders")
 
+    from psycopg3.oids import builtins
     from psycopg3.adapt import Loader
-    from psycopg3.types import builtins
 
     TextLoader.register(0)    # INVALID_OID
     TextLoader.register(builtins["text"].oid)

diff --git a/tests/test_adapt.py b/tests/test_adapt.py
index 03734bc6442f962a3ab261305f9d55f0f8d1ff4f..5787bf1166e6284aad9adf1adc56281469c67e4e 100644 (file)
--- a/tests/test_adapt.py
+++ b/tests/test_adapt.py
@@ -1,6 +1,6 @@
 import pytest
 from psycopg3.adapt import Transformer, Format, Dumper, Loader
-from psycopg3.types.oids import builtins
+from psycopg3.oids import builtins
 
 TEXT_OID = builtins["text"].oid
 

diff --git a/tests/test_cursor.py b/tests/test_cursor.py
index 8ffbb3cc56415c51b5ae6baeeefd1a61fe9ecc51..8d819842e4fc973fc6747a48485c7087b8305f09 100644 (file)
--- a/tests/test_cursor.py
+++ b/tests/test_cursor.py
@@ -3,6 +3,7 @@ import pytest
 import weakref
 
 import psycopg3
+from psycopg3.oids import builtins
 
 
 def test_close(conn):

diff --git a/tests/types/test_array.py b/tests/types/test_array.py
index 892354958e4c1a599def37a8bae79b37a2913954..b2a98332752643b36812bc47a34a8ac317818e74 100644 (file)
--- a/tests/types/test_array.py
+++ b/tests/types/test_array.py
@@ -1,7 +1,8 @@
 import pytest
 import psycopg3
-from psycopg3.types import builtins, array
+from psycopg3.oids import builtins
 from psycopg3.adapt import Format, Transformer
+from psycopg3.types import array
 
 
 tests_str = [

diff --git a/tests/types/test_composite.py b/tests/types/test_composite.py
index a242892861fbdaa1ab6eb786b938a082dce4249a..0aa36b798e1d9597dd27928ba7b0012269082d09 100644 (file)
--- a/tests/types/test_composite.py
+++ b/tests/types/test_composite.py
@@ -1,7 +1,8 @@
 import pytest
 
+from psycopg3.oids import builtins
 from psycopg3.adapt import Format, Loader
-from psycopg3.types import builtins, composite
+from psycopg3.types import composite
 
 
 tests_str = [

diff --git a/tests/types/test_numeric.py b/tests/types/test_numeric.py
index d4d557523a58b17fbdb68f6e4dd152f9268640d0..d982b0f0c45869227cd913054bc43d6099e3c158 100644 (file)
--- a/tests/types/test_numeric.py
+++ b/tests/types/test_numeric.py
@@ -4,8 +4,8 @@ from math import isnan, isinf, exp
 import pytest
 
 from psycopg3 import sql
+from psycopg3.oids import builtins
 from psycopg3.adapt import Transformer, Format
-from psycopg3.types import builtins
 from psycopg3.types.numeric import FloatLoader
 
 

diff --git a/tests/types/test_singletons.py b/tests/types/test_singletons.py
index c3c41e2837801b6053c689aee17979eb679bacac..c27c1c7f07263867ddf781ced1b2634d1cd5103c 100644 (file)
--- a/tests/types/test_singletons.py
+++ b/tests/types/test_singletons.py
@@ -1,8 +1,8 @@
 import pytest
 
 from psycopg3 import sql
+from psycopg3.oids import builtins
 from psycopg3.adapt import Transformer, Format
-from psycopg3.types import builtins
 
 
 @pytest.mark.parametrize("fmt_in", [Format.TEXT, Format.BINARY])