From: Daniele Varrazzo Date: Wed, 28 Oct 2020 00:11:39 +0000 (+0100) Subject: 'psycopg3.transform' module made private X-Git-Tag: 3.0.dev0~444 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51bdde940428a829cac86762b1ac6a9259d1a24c;p=thirdparty%2Fpsycopg.git 'psycopg3.transform' module made private It's too easy to import psycopg3.transform.Transformer when instead the C module is the one enabled. This will make some isinstance fail, and e.g. _connecion_from_context would throw a TypeError. --- diff --git a/psycopg3/psycopg3/transform.py b/psycopg3/psycopg3/_transform.py similarity index 100% rename from psycopg3/psycopg3/transform.py rename to psycopg3/psycopg3/_transform.py diff --git a/psycopg3/psycopg3/adapt.py b/psycopg3/psycopg3/adapt.py index aa2f3a809..1cb92e92a 100644 --- a/psycopg3/psycopg3/adapt.py +++ b/psycopg3/psycopg3/adapt.py @@ -4,7 +4,7 @@ Entry point into the adaptation system. # Copyright (C) 2020 The Psycopg Team -from typing import Any, Callable, Optional, Type +from typing import Any, Callable, Optional, Tuple, Type from . import pq from . import proto @@ -139,8 +139,8 @@ class Loader: return binary_ -_dumper_classes = (Dumper,) -_loader_classes = (Loader,) +_dumper_classes: Tuple[type, ...] = (Dumper,) +_loader_classes: Tuple[type, ...] = (Loader,) def _connection_from_context( @@ -165,8 +165,8 @@ if pq.__impl__ == "c": from psycopg3_c import _psycopg3 Transformer = _psycopg3.Transformer - _loader_classes = (Loader, _psycopg3.CLoader) # type: ignore + _loader_classes = (Loader, _psycopg3.CLoader) # type: ignore[attr-defined] else: - from . import transform + from . import _transform - Transformer = transform.Transformer + Transformer = _transform.Transformer