Typecaster renamed to TypeCaster

Because I have ArrayCaster, will have RangeCaster etc.

diff --git a/psycopg3/adapt.py b/psycopg3/adapt.py
index 73d3ec97a77e715f998552d4e15d8b20c05e074a..4ddd50190eee50d96236c99bb0765bb5c75dafc1 100644 (file)
--- a/psycopg3/adapt.py
+++ b/psycopg3/adapt.py
@@ -28,9 +28,9 @@ AdapterFunc = Callable[[Any], MaybeOid]
 AdapterType = Union["Adapter", AdapterFunc]
 AdaptersMap = Dict[Tuple[type, Format], AdapterType]
 
-TypecasterFunc = Callable[[bytes], Any]
-TypecasterType = Union["Typecaster", TypecasterFunc]
-TypecastersMap = Dict[Tuple[int, Format], TypecasterType]
+TypeCasterFunc = Callable[[bytes], Any]
+TypeCasterType = Union["TypeCaster", TypeCasterFunc]
+TypeCastersMap = Dict[Tuple[int, Format], TypeCasterType]
 
 
 class Adapter:
@@ -99,8 +99,8 @@ class Adapter:
         return binary_
 
 
-class Typecaster:
-    globals: TypecastersMap = {}
+class TypeCaster:
+    globals: TypeCastersMap = {}
 
     def __init__(self, oid: int, conn: Optional[BaseConnection]):
         self.oid = oid
@@ -112,10 +112,10 @@ class Typecaster:
     @staticmethod
     def register(
         oid: int,
-        caster: TypecasterType,
+        caster: TypeCasterType,
         context: AdaptContext = None,
         format: Format = Format.TEXT,
-    ) -> TypecasterType:
+    ) -> TypeCasterType:
         if not isinstance(oid, int):
             raise TypeError(
                 f"typecasters should be registered on oid, got {oid} instead"
@@ -131,35 +131,35 @@ class Typecaster:
 
         if not (
             callable(caster)
-            or (isinstance(caster, type) and issubclass(caster, Typecaster))
+            or (isinstance(caster, type) and issubclass(caster, TypeCaster))
         ):
             raise TypeError(
-                f"adapters should be callable or Typecaster subclasses,"
+                f"adapters should be callable or TypeCaster subclasses,"
                 f" got {caster} instead"
             )
 
-        where = context.casters if context is not None else Typecaster.globals
+        where = context.casters if context is not None else TypeCaster.globals
         where[oid, format] = caster
         return caster
 
     @staticmethod
     def register_binary(
-        oid: int, caster: TypecasterType, context: AdaptContext = None,
-    ) -> TypecasterType:
-        return Typecaster.register(oid, caster, context, format=Format.BINARY)
+        oid: int, caster: TypeCasterType, context: AdaptContext = None,
+    ) -> TypeCasterType:
+        return TypeCaster.register(oid, caster, context, format=Format.BINARY)
 
     @staticmethod
     def text(oid: int) -> Callable[[Any], Any]:
-        def text_(caster: TypecasterType) -> TypecasterType:
-            Typecaster.register(oid, caster)
+        def text_(caster: TypeCasterType) -> TypeCasterType:
+            TypeCaster.register(oid, caster)
             return caster
 
         return text_
 
     @staticmethod
     def binary(oid: int) -> Callable[[Any], Any]:
-        def binary_(caster: TypecasterType) -> TypecasterType:
-            Typecaster.register_binary(oid, caster)
+        def binary_(caster: TypeCasterType) -> TypeCasterType:
+            TypeCaster.register_binary(oid, caster)
             return caster
 
         return binary_
@@ -197,14 +197,14 @@ class Transformer:
         self._adapt_funcs: Dict[Tuple[type, Format], AdapterFunc] = {}
 
         # mapping oid, fmt -> cast function
-        self._cast_funcs: Dict[Tuple[int, Format], TypecasterFunc] = {}
+        self._cast_funcs: Dict[Tuple[int, Format], TypeCasterFunc] = {}
 
         # The result to return values from
         self._result: Optional[PGresult] = None
 
         # sequence of cast function from value to python
         # the length of the result columns
-        self._row_casters: List[TypecasterFunc] = []
+        self._row_casters: List[TypeCasterFunc] = []
 
     @property
     def result(self) -> Optional[PGresult]:
@@ -297,7 +297,7 @@ class Transformer:
         else:
             return None
 
-    def get_cast_function(self, oid: int, fmt: Format) -> TypecasterFunc:
+    def get_cast_function(self, oid: int, fmt: Format) -> TypeCasterFunc:
         try:
             return self._cast_funcs[oid, fmt]
         except KeyError:
@@ -307,9 +307,9 @@ class Transformer:
         if isinstance(caster, type):
             return caster(oid, self.connection).cast
         else:
-            return cast(TypecasterFunc, caster)
+            return cast(TypeCasterFunc, caster)
 
-    def lookup_caster(self, oid: int, fmt: Format) -> TypecasterType:
+    def lookup_caster(self, oid: int, fmt: Format) -> TypeCasterType:
         key = (oid, fmt)
 
         cur = self.cursor
@@ -320,14 +320,14 @@ class Transformer:
         if conn is not None and key in conn.casters:
             return conn.casters[key]
 
-        if key in Typecaster.globals:
-            return Typecaster.globals[key]
+        if key in TypeCaster.globals:
+            return TypeCaster.globals[key]
 
-        return Typecaster.globals[INVALID_OID, fmt]
+        return TypeCaster.globals[INVALID_OID, fmt]
 
 
-@Typecaster.text(INVALID_OID)
-class UnknownCaster(Typecaster):
+@TypeCaster.text(INVALID_OID)
+class UnknownCaster(TypeCaster):
     """
     Fallback object to convert unknown types to Python
     """
@@ -344,6 +344,6 @@ class UnknownCaster(Typecaster):
         return self.decode(data)[0]
 
 
-@Typecaster.binary(INVALID_OID)
+@TypeCaster.binary(INVALID_OID)
 def cast_unknown(data: bytes) -> bytes:
     return data

diff --git a/psycopg3/connection.py b/psycopg3/connection.py
index ec282b6b0d72bd9ef3ce2520d059612f452b978d..67e33abf6198d200e9fbb7df8fc7cb24787f5761 100644 (file)
--- a/psycopg3/connection.py
+++ b/psycopg3/connection.py
@@ -24,7 +24,7 @@ QueryGen = Generator[Tuple[int, Wait], Ready, List[pq.PGresult]]
 RV = TypeVar("RV")
 
 if TYPE_CHECKING:
-    from .adapt import AdaptersMap, TypecastersMap
+    from .adapt import AdaptersMap, TypeCastersMap
 
 
 class BaseConnection:
@@ -39,7 +39,7 @@ class BaseConnection:
         self.pgconn = pgconn
         self.cursor_factory = cursor.BaseCursor
         self.adapters: AdaptersMap = {}
-        self.casters: TypecastersMap = {}
+        self.casters: TypeCastersMap = {}
         # name of the postgres encoding (in bytes)
         self._pgenc = b""
 

diff --git a/psycopg3/cursor.py b/psycopg3/cursor.py
index 1e0e3b7e701bd021b8e7d50bfc95d1d19f07537c..9c417fc7141a92c9bcd16ae18086aeaefa08d63f 100644 (file)
--- a/psycopg3/cursor.py
+++ b/psycopg3/cursor.py
@@ -18,7 +18,7 @@ if TYPE_CHECKING:
         AsyncConnection,
         QueryGen,
     )
-    from .adapt import AdaptersMap, TypecastersMap
+    from .adapt import AdaptersMap, TypeCastersMap
 
 
 class BaseCursor:
@@ -26,7 +26,7 @@ class BaseCursor:
         self.conn = conn
         self.binary = binary
         self.adapters: AdaptersMap = {}
-        self.casters: TypecastersMap = {}
+        self.casters: TypeCastersMap = {}
         self._reset()
 
     def _reset(self) -> None:

diff --git a/psycopg3/types/array.py b/psycopg3/types/array.py
index 90b1bc669f79a168b043eeded4ea114881b0c2d8..69b1361de01f7acbbdf8e4b0697810dbe95c46f7 100644 (file)
--- a/psycopg3/types/array.py
+++ b/psycopg3/types/array.py
@@ -9,8 +9,8 @@ from typing import Any, Callable, List, Optional, cast, TYPE_CHECKING
 
 from .. import errors as e
 from ..pq import Format
-from ..adapt import Adapter, Typecaster, Transformer, UnknownCaster
-from ..adapt import AdaptContext, TypecasterType, TypecasterFunc
+from ..adapt import Adapter, TypeCaster, Transformer, UnknownCaster
+from ..adapt import AdaptContext, TypeCasterType, TypeCasterFunc
 
 if TYPE_CHECKING:
     from ..connection import BaseConnection
@@ -90,19 +90,19 @@ class ListAdapter(Adapter):
         tokens[-1] = b"}"
 
 
-class ArrayCasterBase(Typecaster):
-    base_caster: TypecasterType
+class ArrayCasterBase(TypeCaster):
+    base_caster: TypeCasterType
 
     def __init__(
         self, oid: int, conn: Optional["BaseConnection"],
     ):
         super().__init__(oid, conn)
-        self.caster_func = TypecasterFunc  # type: ignore
+        self.caster_func = TypeCasterFunc  # type: ignore
 
         if isinstance(self.base_caster, type):
             self.caster_func = self.base_caster(oid, conn).cast
         else:
-            self.caster_func = cast(TypecasterFunc, type(self).base_caster)
+            self.caster_func = cast(TypeCasterFunc, type(self).base_caster)
 
     def cast(self, data: bytes) -> List[Any]:
         rv = None
@@ -141,24 +141,24 @@ class ArrayCasterBase(Typecaster):
         return rv
 
 
-class ArrayCaster(Typecaster):
+class ArrayCaster(TypeCaster):
     @staticmethod
     def register(
         oid: int,  # array oid
-        caster: TypecasterType,
+        caster: TypeCasterType,
         context: AdaptContext = None,
         format: Format = Format.TEXT,
-    ) -> TypecasterType:
+    ) -> TypeCasterType:
         t = type(
             caster.__name__ + "_array",  # type: ignore
             (ArrayCasterBase,),
             {"base_caster": caster},
         )
-        return Typecaster.register(oid, t, context=context, format=format)
+        return TypeCaster.register(oid, t, context=context, format=format)
 
     @staticmethod
     def text(oid: int) -> Callable[[Any], Any]:
-        def text_(caster: TypecasterType) -> TypecasterType:
+        def text_(caster: TypeCasterType) -> TypeCasterType:
             ArrayCaster.register(oid, caster, format=Format.TEXT)
             return caster
 

diff --git a/psycopg3/types/numeric.py b/psycopg3/types/numeric.py
index c942f2a30367f85e4392712b0e6adebcaaf7261b..b06a99cf27b1a36845d3c9d1708f8590d96c2e29 100644 (file)
--- a/psycopg3/types/numeric.py
+++ b/psycopg3/types/numeric.py
@@ -9,7 +9,7 @@ import struct
 from decimal import Decimal
 from typing import Tuple
 
-from ..adapt import Adapter, Typecaster
+from ..adapt import Adapter, TypeCaster
 from .oids import builtins
 from .array import ArrayCaster
 
@@ -56,10 +56,10 @@ def adapt_bool(obj: bool) -> Tuple[bytes, int]:
     return _bool_adapt[obj]
 
 
-@Typecaster.text(builtins["int2"].oid)
-@Typecaster.text(builtins["int4"].oid)
-@Typecaster.text(builtins["int8"].oid)
-@Typecaster.text(builtins["oid"].oid)
+@TypeCaster.text(builtins["int2"].oid)
+@TypeCaster.text(builtins["int4"].oid)
+@TypeCaster.text(builtins["int8"].oid)
+@TypeCaster.text(builtins["oid"].oid)
 @ArrayCaster.text(builtins["int2"].array_oid)
 @ArrayCaster.text(builtins["int4"].array_oid)
 @ArrayCaster.text(builtins["int8"].array_oid)
@@ -68,50 +68,50 @@ def cast_int(data: bytes) -> int:
     return int(_decode(data)[0])
 
 
-@Typecaster.binary(builtins["int2"].oid)
+@TypeCaster.binary(builtins["int2"].oid)
 def cast_binary_int2(data: bytes) -> int:
     rv: int = _int2_struct.unpack(data)[0]
     return rv
 
 
-@Typecaster.binary(builtins["int4"].oid)
+@TypeCaster.binary(builtins["int4"].oid)
 def cast_binary_int4(data: bytes) -> int:
     rv: int = _int4_struct.unpack(data)[0]
     return rv
 
 
-@Typecaster.binary(builtins["int8"].oid)
+@TypeCaster.binary(builtins["int8"].oid)
 def cast_binary_int8(data: bytes) -> int:
     rv: int = _int8_struct.unpack(data)[0]
     return rv
 
 
-@Typecaster.binary(builtins["oid"].oid)
+@TypeCaster.binary(builtins["oid"].oid)
 def cast_binary_oid(data: bytes) -> int:
     rv: int = _oid_struct.unpack(data)[0]
     return rv
 
 
-@Typecaster.text(builtins["float4"].oid)
-@Typecaster.text(builtins["float8"].oid)
+@TypeCaster.text(builtins["float4"].oid)
+@TypeCaster.text(builtins["float8"].oid)
 def cast_float(data: bytes) -> float:
     # it supports bytes directly
     return float(data)
 
 
-@Typecaster.binary(builtins["float4"].oid)
+@TypeCaster.binary(builtins["float4"].oid)
 def cast_binary_float4(data: bytes) -> float:
     rv: float = _float4_struct.unpack(data)[0]
     return rv
 
 
-@Typecaster.binary(builtins["float8"].oid)
+@TypeCaster.binary(builtins["float8"].oid)
 def cast_binary_float8(data: bytes) -> float:
     rv: float = _float8_struct.unpack(data)[0]
     return rv
 
 
-@Typecaster.text(builtins["numeric"].oid)
+@TypeCaster.text(builtins["numeric"].oid)
 def cast_numeric(data: bytes) -> Decimal:
     return Decimal(_decode(data)[0])
 
@@ -120,11 +120,11 @@ _bool_casts = {b"t": True, b"f": False}
 _bool_binary_casts = {b"\x01": True, b"\x00": False}
 
 
-@Typecaster.text(builtins["bool"].oid)
+@TypeCaster.text(builtins["bool"].oid)
 def cast_bool(data: bytes) -> bool:
     return _bool_casts[data]
 
 
-@Typecaster.binary(builtins["bool"].oid)
+@TypeCaster.binary(builtins["bool"].oid)
 def cast_binary_bool(data: bytes) -> bool:
     return _bool_binary_casts[data]

diff --git a/psycopg3/types/text.py b/psycopg3/types/text.py
index 4083d30225c70dfbc4e928e3b096836e145ed0e2..7ad58788089f73cdbe4f8a89a70bd9f4d7cf189f 100644 (file)
--- a/psycopg3/types/text.py
+++ b/psycopg3/types/text.py
@@ -9,7 +9,7 @@ from typing import Optional, Tuple, Union
 
 from ..adapt import (
     Adapter,
-    Typecaster,
+    TypeCaster,
 )
 from ..connection import BaseConnection
 from ..utils.typing import EncodeFunc, DecodeFunc
@@ -40,10 +40,10 @@ class StringAdapter(Adapter):
         return self._encode(obj)[0]
 
 
-@Typecaster.text(builtins["text"].oid)
-@Typecaster.binary(builtins["text"].oid)
+@TypeCaster.text(builtins["text"].oid)
+@TypeCaster.binary(builtins["text"].oid)
 @ArrayCaster.text(builtins["text"].array_oid)
-class StringCaster(Typecaster):
+class StringCaster(TypeCaster):
 
     decode: Optional[DecodeFunc]
 
@@ -81,12 +81,12 @@ def adapt_bytes(b: bytes) -> Tuple[bytes, int]:
     return b, BYTEA_OID
 
 
-@Typecaster.text(builtins["bytea"].oid)
+@TypeCaster.text(builtins["bytea"].oid)
 @ArrayCaster.text(builtins["bytea"].array_oid)
 def cast_bytea(data: bytes) -> bytes:
     return Escaping.unescape_bytea(data)
 
 
-@Typecaster.binary(builtins["bytea"].oid)
+@TypeCaster.binary(builtins["bytea"].oid)
 def cast_bytea_binary(data: bytes) -> bytes:
     return data

diff --git a/tests/test_adapt.py b/tests/test_adapt.py
index d1f480fd9ea839756588e7c34f67e57241ed3a7d..02bceb36a8995f2ca406671e6320d8f707ea5878 100644 (file)
--- a/tests/test_adapt.py
+++ b/tests/test_adapt.py
@@ -1,5 +1,5 @@
 import pytest
-from psycopg3.adapt import Transformer, Format, Adapter, Typecaster
+from psycopg3.adapt import Transformer, Format, Adapter, TypeCaster
 from psycopg3.types.oids import builtins
 
 TEXT_OID = builtins["text"].oid
@@ -67,8 +67,8 @@ def test_cast(data, format, type, result):
 
 
 def test_cast_connection_ctx(conn):
-    Typecaster.register(TEXT_OID, lambda b: b.decode("ascii") + "t", conn)
-    Typecaster.register_binary(
+    TypeCaster.register(TEXT_OID, lambda b: b.decode("ascii") + "t", conn)
+    TypeCaster.register_binary(
         TEXT_OID, lambda b: b.decode("ascii") + "b", conn
     )
 
@@ -79,14 +79,14 @@ def test_cast_connection_ctx(conn):
 
 
 def test_cast_cursor_ctx(conn):
-    Typecaster.register(TEXT_OID, lambda b: b.decode("ascii") + "t", conn)
-    Typecaster.register_binary(
+    TypeCaster.register(TEXT_OID, lambda b: b.decode("ascii") + "t", conn)
+    TypeCaster.register_binary(
         TEXT_OID, lambda b: b.decode("ascii") + "b", conn
     )
 
     cur = conn.cursor()
-    Typecaster.register(TEXT_OID, lambda b: b.decode("ascii") + "tc", cur)
-    Typecaster.register_binary(
+    TypeCaster.register(TEXT_OID, lambda b: b.decode("ascii") + "tc", cur)
+    TypeCaster.register_binary(
         TEXT_OID, lambda b: b.decode("ascii") + "bc", cur
     )
 

diff --git a/tests/types/test_array.py b/tests/types/test_array.py
index 48853ff576015c626ad225410403c701c54b016f..c69733719b4a6b7492bb705677ef8a99a417c32d 100644 (file)
--- a/tests/types/test_array.py
+++ b/tests/types/test_array.py
@@ -1,6 +1,6 @@
 import pytest
 from psycopg3.types import builtins
-from psycopg3.adapt import Typecaster, UnknownCaster
+from psycopg3.adapt import TypeCaster, UnknownCaster
 from psycopg3.types.array import UnknownArrayCaster, ArrayCaster
 
 
@@ -72,8 +72,8 @@ def test_cast_list_int(conn, obj, want):
 
 def test_unknown(conn):
     # unknown for real
-    assert builtins["aclitem"].array_oid not in Typecaster.globals
-    Typecaster.register(
+    assert builtins["aclitem"].array_oid not in TypeCaster.globals
+    TypeCaster.register(
         builtins["aclitem"].array_oid, UnknownArrayCaster, context=conn
     )
     cur = conn.cursor()

diff --git a/tests/types/test_numeric.py b/tests/types/test_numeric.py
index 99f759d7b9f4ba04358304e7d8246ca0dcb7ab84..e639e26370385f66ff5e185d53323925a48d4fbd 100644 (file)
--- a/tests/types/test_numeric.py
+++ b/tests/types/test_numeric.py
@@ -3,7 +3,7 @@ from math import isnan, isinf, exp
 
 import pytest
 
-from psycopg3.adapt import Typecaster, Format
+from psycopg3.adapt import TypeCaster, Format
 from psycopg3.types import builtins
 from psycopg3.types.numeric import cast_float
 
@@ -209,7 +209,7 @@ def test_roundtrip_numeric(conn, val):
 )
 def test_numeric_as_float(conn, val):
     cur = conn.cursor()
-    Typecaster.register(builtins["numeric"].oid, cast_float, cur)
+    TypeCaster.register(builtins["numeric"].oid, cast_float, cur)
 
     val = Decimal(val)
     cur.execute("select %s", (val,))