From: Daniele Varrazzo Date: Fri, 7 Aug 2020 03:00:48 +0000 (+0100) Subject: Transformer.lookup_loader/dumper dropped from interface X-Git-Tag: 3.0.dev0~458^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6aff44c5f439771e2bd77c8f507c040696634d26;p=thirdparty%2Fpsycopg.git Transformer.lookup_loader/dumper dropped from interface --- diff --git a/psycopg3/psycopg3/proto.py b/psycopg3/psycopg3/proto.py index 63c9e62f2..93c0f2bce 100644 --- a/psycopg3/psycopg3/proto.py +++ b/psycopg3/psycopg3/proto.py @@ -79,9 +79,6 @@ class Transformer(Protocol): def get_dumper(self, obj: Any, format: Format) -> "Dumper": ... - def lookup_dumper(self, src: type, format: Format) -> DumperType: - ... - def load_row(self, row: int) -> Optional[Tuple[Any, ...]]: ... @@ -92,6 +89,3 @@ class Transformer(Protocol): def get_loader(self, oid: int, format: Format) -> "Loader": ... - - def lookup_loader(self, oid: int, format: Format) -> LoaderType: - ... diff --git a/psycopg3/psycopg3/transform.py b/psycopg3/psycopg3/transform.py index 208871857..f0b5cf76c 100644 --- a/psycopg3/psycopg3/transform.py +++ b/psycopg3/psycopg3/transform.py @@ -150,11 +150,11 @@ class Transformer: except KeyError: pass - dumper_cls = self.lookup_dumper(*key) + dumper_cls = self._lookup_dumper(*key) self._dumpers_cache[key] = dumper = dumper_cls(key[0], self) return dumper - def lookup_dumper(self, src: type, format: Format) -> DumperType: + def _lookup_dumper(self, src: type, format: Format) -> DumperType: key = (src, format) for amap in self._dumpers_maps: if key in amap: @@ -197,11 +197,11 @@ class Transformer: except KeyError: pass - loader_cls = self.lookup_loader(*key) + loader_cls = self._lookup_loader(*key) self._loaders_cache[key] = loader = loader_cls(key[0], self) return loader - def lookup_loader(self, oid: int, format: Format) -> LoaderType: + def _lookup_loader(self, oid: int, format: Format) -> LoaderType: key = (oid, format) for tcmap in self._loaders_maps: diff --git a/psycopg3_c/psycopg3_c/_psycopg3.pyi b/psycopg3_c/psycopg3_c/_psycopg3.pyi index 5a38e0861..ff14ded20 100644 --- a/psycopg3_c/psycopg3_c/_psycopg3.pyi +++ b/psycopg3_c/psycopg3_c/_psycopg3.pyi @@ -34,13 +34,11 @@ class Transformer: self, types: Sequence[Tuple[int, pq.Format]] ) -> None: ... def get_dumper(self, obj: Any, format: pq.Format) -> Dumper: ... - def lookup_dumper(self, src: type, format: pq.Format) -> DumperType: ... def load_row(self, row: int) -> Optional[Tuple[Any, ...]]: ... def load_sequence( self, record: Sequence[Optional[bytes]] ) -> Tuple[Any, ...]: ... def get_loader(self, oid: int, format: pq.Format) -> Loader: ... - def lookup_loader(self, oid: int, format: pq.Format) -> LoaderType: ... def register_builtin_c_loaders() -> None: ... def connect(conninfo: str) -> PQGen[pq.proto.PGconn]: ... diff --git a/psycopg3_c/psycopg3_c/transform.pyx b/psycopg3_c/psycopg3_c/transform.pyx index f59776068..bc656c12b 100644 --- a/psycopg3_c/psycopg3_c/transform.pyx +++ b/psycopg3_c/psycopg3_c/transform.pyx @@ -184,11 +184,11 @@ cdef class Transformer: except KeyError: pass - dumper_cls = self.lookup_dumper(*key) + dumper_cls = self._lookup_dumper(*key) self._dumpers_cache[key] = dumper = dumper_cls(key[0], self) return dumper - def lookup_dumper(self, src: type, format: Format) -> "DumperType": + def _lookup_dumper(self, src: type, format: Format) -> "DumperType": key = (src, format) for amap in self._dumpers_maps: if key in amap: @@ -257,11 +257,11 @@ cdef class Transformer: except KeyError: pass - loader_cls = self.lookup_loader(*key) + loader_cls = self._lookup_loader(*key) self._loaders_cache[key] = loader = loader_cls(key[0], self) return loader - def lookup_loader(self, oid: int, format: Format) -> "LoaderType": + def _lookup_loader(self, oid: int, format: Format) -> "LoaderType": key = (oid, format) for tcmap in self._loaders_maps: