Work around mypy error of Format not exposed by psycopg3.adapt

diff --git a/psycopg3/adapt.py b/psycopg3/adapt.py
index 14408b3c29a6a0be1c90dd8069116b717a5dded1..8eef3587bb02f1ded4902ce4d4db94c22388c301 100644 (file)
--- a/psycopg3/adapt.py
+++ b/psycopg3/adapt.py
@@ -9,7 +9,7 @@ from typing import Any, Callable, Dict, Generator, Iterable, List, Optional
 from typing import Tuple, Type, Union
 
 from . import errors as e
-from .pq import Format
+from . import pq
 from .cursor import BaseCursor
 from .types.oids import builtins, INVALID_OID
 from .connection import BaseConnection
@@ -17,6 +17,8 @@ from .utils.typing import DecodeFunc
 
 TEXT_OID = builtins["text"].oid
 
+# Part of the module interface (just importing it makes mypy unhappy)
+Format = pq.Format
 
 # Type system
 

diff --git a/psycopg3/types/array.py b/psycopg3/types/array.py
index 4d286bf42d07bed5d741d1bb3609a35982fb4b5d..f7bab1f26bc0663d7cb637357789d504ac6330c0 100644 (file)
--- a/psycopg3/types/array.py
+++ b/psycopg3/types/array.py
@@ -9,8 +9,7 @@ import struct
 from typing import Any, Generator, List, Tuple
 
 from .. import errors as e
-from ..pq import Format
-from ..adapt import Adapter, TypeCaster, Transformer, UnknownCaster
+from ..adapt import Format, Adapter, TypeCaster, Transformer, UnknownCaster
 from ..adapt import AdaptContext, TypeCasterType, TypeCasterFunc
 from .oids import builtins
 

diff --git a/psycopg3/types/composite.py b/psycopg3/types/composite.py
index f0779a8f15b2614895a1d1c49e4d218b59ac3384..f663d4e57a6542e6c842dda5bbe4ae571c958d9b 100644 (file)
--- a/psycopg3/types/composite.py
+++ b/psycopg3/types/composite.py
@@ -6,8 +6,7 @@ import re
 import struct
 from typing import Any, Generator, Optional, Tuple
 
-from ..pq import Format
-from ..adapt import TypeCaster, Transformer, AdaptContext
+from ..adapt import Format, TypeCaster, Transformer, AdaptContext
 from .oids import builtins