Don't use the generic name register_adapters

There will be cases in which there is more than one type in the same
module...

diff --git a/psycopg/psycopg/_typeinfo.py b/psycopg/psycopg/_typeinfo.py
index 16cf6687fb127ed11480efd3822274b497990780..17f572fda5e04bffd0f9795ca1006260d15d9c9c 100644 (file)
--- a/psycopg/psycopg/_typeinfo.py
+++ b/psycopg/psycopg/_typeinfo.py
@@ -136,9 +136,9 @@ class TypeInfo:
         types.add(self)
 
         if self.array_oid:
-            from .types.array import register_adapters
+            from .types.array import register_array
 
-            register_adapters(self, context)
+            register_array(self, context)
 
     _info_query = """\
 SELECT
@@ -162,9 +162,9 @@ class RangeInfo(TypeInfo):
     def register(self, context: Optional[AdaptContext] = None) -> None:
         super().register(context)
 
-        from .types.range import register_adapters
+        from .types.range import register_range
 
-        register_adapters(self, context)
+        register_range(self, context)
 
     _info_query = """\
 SELECT t.typname AS name, t.oid AS oid, t.typarray AS array_oid,
@@ -199,9 +199,9 @@ class CompositeInfo(TypeInfo):
     ) -> None:
         super().register(context)
 
-        from .types.composite import register_adapters
+        from .types.composite import register_composite
 
-        register_adapters(self, context, factory)
+        register_composite(self, context, factory)
 
     _info_query = """\
 SELECT

diff --git a/psycopg/psycopg/types/array.py b/psycopg/psycopg/types/array.py
index bd3fa9b66c9df5eedccfeade58ba0dba4bfb74d6..21601a41310c3c85c62c163c62693d34d279025a 100644 (file)
--- a/psycopg/psycopg/types/array.py
+++ b/psycopg/psycopg/types/array.py
@@ -414,7 +414,7 @@ class ArrayBinaryLoader(BaseArrayLoader):
         return agg(dims)
 
 
-def register_adapters(
+def register_array(
     info: TypeInfo, context: Optional[AdaptContext] = None
 ) -> None:
     adapters = context.adapters if context else postgres.adapters

diff --git a/psycopg/psycopg/types/composite.py b/psycopg/psycopg/types/composite.py
index 5cc567efee1102f2dfaca49078d03e5a0221332d..7112384007430448e0b84dae8df74bd5120d5129 100644 (file)
--- a/psycopg/psycopg/types/composite.py
+++ b/psycopg/psycopg/types/composite.py
@@ -183,7 +183,7 @@ class CompositeBinaryLoader(RecordBinaryLoader):
         return type(self).factory(*r)
 
 
-def register_adapters(
+def register_composite(
     info: CompositeInfo,
     context: Optional[AdaptContext] = None,
     factory: Optional[Callable[..., Any]] = None,

diff --git a/psycopg/psycopg/types/hstore.py b/psycopg/psycopg/types/hstore.py
index 3367bc07b79fa0cfa21f825171b6ac88f1004cd0..59a5013b7e60b8db72ebc6ec897eb648165fc6a1 100644 (file)
--- a/psycopg/psycopg/types/hstore.py
+++ b/psycopg/psycopg/types/hstore.py
@@ -105,7 +105,7 @@ class HstoreLoader(RecursiveLoader):
         return rv
 
 
-def register_adapters(
+def register_hstore(
     info: TypeInfo, context: Optional[AdaptContext] = None
 ) -> None:
 

diff --git a/psycopg/psycopg/types/range.py b/psycopg/psycopg/types/range.py
index b343fd64460d48a17b8b6157d5fac5440f87defc..44e1af4252ed81902c1351e89cd0ed25bdc40961 100644 (file)
--- a/psycopg/psycopg/types/range.py
+++ b/psycopg/psycopg/types/range.py
@@ -435,9 +435,16 @@ class RangeBinaryLoader(RecursiveLoader, Generic[T]):
 _int2parens = {ord(c): c for c in "[]()"}
 
 
-def register_adapters(
+def register_range(
     info: RangeInfo, context: Optional[AdaptContext] = None
 ) -> None:
+    """
+    Register custom range adapters on a context.
+
+    Just register loaders associated to the range oid, loading bounds of the
+    right subtype. Dumping the range just works, navigating from tye Python
+    type to the type oid, to the range oid.
+    """
     adapters = context.adapters if context else postgres.adapters
 
     # generate and register a customized text loader

diff --git a/tests/test_copy.py b/tests/test_copy.py
index d955ced01ec4326e53c51ba30195bda706f86f54..6994ab4b1b18f81afb166528dabb79c682624e2c 100644 (file)
--- a/tests/test_copy.py
+++ b/tests/test_copy.py
@@ -13,7 +13,7 @@ from psycopg import errors as e
 from psycopg.pq import Format
 from psycopg.adapt import PyFormat as PgFormat
 from psycopg.types import TypeInfo
-from psycopg.types.hstore import register_adapters as register_hstore
+from psycopg.types.hstore import register_hstore
 from psycopg.types.numeric import Int4
 
 from .utils import gc_collect

diff --git a/tests/test_copy_async.py b/tests/test_copy_async.py
index 9d1f76311c4ff8c8b94e411fdee36687e1ae7e88..fe5ac59f2d7f2014270589f8ecc60315d13f4a02 100644 (file)
--- a/tests/test_copy_async.py
+++ b/tests/test_copy_async.py
@@ -13,7 +13,7 @@ from psycopg import errors as e
 from psycopg.pq import Format
 from psycopg.types import TypeInfo
 from psycopg.adapt import PyFormat as PgFormat
-from psycopg.types.hstore import register_adapters as register_hstore
+from psycopg.types.hstore import register_hstore
 
 from .utils import gc_collect
 from .test_copy import sample_text, sample_binary, sample_binary_rows  # noqa

diff --git a/tests/types/test_hstore.py b/tests/types/test_hstore.py
index f81a492912eef9913cf5179d4a79c7ebc59d2ce9..6ec75662cb672e8930000c56c2dd596dc1c4c474 100644 (file)
--- a/tests/types/test_hstore.py
+++ b/tests/types/test_hstore.py
@@ -2,7 +2,7 @@ import pytest
 
 import psycopg
 from psycopg.types import TypeInfo
-from psycopg.types.hstore import HstoreLoader, register_adapters
+from psycopg.types.hstore import HstoreLoader, register_hstore
 
 
 @pytest.mark.parametrize(
@@ -46,7 +46,7 @@ def test_parse_bad(s):
 
 def test_register_conn(hstore, conn):
     info = TypeInfo.fetch(conn, "hstore")
-    register_adapters(info, conn)
+    register_hstore(info, conn)
     assert conn.adapters.types[info.oid].name == "hstore"
 
     cur = conn.execute("select null::hstore, ''::hstore, 'a => b'::hstore")
@@ -56,7 +56,7 @@ def test_register_conn(hstore, conn):
 def test_register_curs(hstore, conn):
     info = TypeInfo.fetch(conn, "hstore")
     cur = conn.cursor()
-    register_adapters(info, cur)
+    register_hstore(info, cur)
     assert conn.adapters.types.get(info.oid) is None
     assert cur.adapters.types[info.oid].name == "hstore"
 
@@ -66,7 +66,7 @@ def test_register_curs(hstore, conn):
 
 def test_register_globally(hstore, dsn, svcconn, global_adapters):
     info = TypeInfo.fetch(svcconn, "hstore")
-    register_adapters(info)
+    register_hstore(info)
     assert psycopg.adapters.types[info.oid].name == "hstore"
 
     assert svcconn.adapters.types.get(info.oid) is None
@@ -88,12 +88,12 @@ samp = [
 
 @pytest.mark.parametrize("d", samp)
 def test_roundtrip(hstore, conn, d):
-    register_adapters(TypeInfo.fetch(conn, "hstore"), conn)
+    register_hstore(TypeInfo.fetch(conn, "hstore"), conn)
     d1 = conn.execute("select %s", [d]).fetchone()[0]
     assert d == d1
 
 
 def test_roundtrip_array(hstore, conn):
-    register_adapters(TypeInfo.fetch(conn, "hstore"), conn)
+    register_hstore(TypeInfo.fetch(conn, "hstore"), conn)
     samp1 = conn.execute("select %s", (samp,)).fetchone()[0]
     assert samp1 == samp