From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Fri, 30 Oct 2020 01:55:43 +0000 (+0100)
Subject: oids module moved from psycopg3.types to psycog3 package
X-Git-Tag: 3.0.dev0~408
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f37e801bd7aa4fc885475b47889a6fb11faec887;p=thirdparty%2Fpsycopg.git

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 345b7d8ea..70d2f99b7 100644
--- 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 d84ca0f08..5343e3236 100644
--- 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 b21eca483..68c5c87fc 100644
--- 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 30d17acc4..7e883ba41 100644
--- 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 7ccda4c7a..a75bbc40a 100644
--- 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 7c8b85804..fbb79490f 100644
--- 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 97dc1d639..64e82fc5e 100644
--- 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 eadc03113..47861903f 100644
--- 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 e202a5156..296082b8e 100644
--- 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 ae2edab47..50b07e557 100644
--- 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 a94a4bb4f..aa39ca42b 100644
--- 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 196085798..1c3073cf8 100644
--- 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 fc3b9578d..37ff17cae 100644
--- 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 4058525b5..46150ddbd 100644
--- 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 a8c2c9030..a7f6f6f76 100644
--- 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 03734bc64..5787bf116 100644
--- 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 8ffbb3cc5..8d819842e 100644
--- 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 892354958..b2a983327 100644
--- 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 a24289286..0aa36b798 100644
--- 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 d4d557523..d982b0f0c 100644
--- 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 c3c41e283..c27c1c7f0 100644
--- 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])