From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Tue, 7 Apr 2020 09:26:49 +0000 (+1200)
Subject: Work around mypy error of Format not exposed by psycopg3.adapt
X-Git-Tag: 3.0.dev0~598
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=54c3cf9bfa6ff16a0636d0a6235b9a4161534125;p=thirdparty%2Fpsycopg.git

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

diff --git a/psycopg3/adapt.py b/psycopg3/adapt.py
index 14408b3c2..8eef3587b 100644
--- 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 4d286bf42..f7bab1f26 100644
--- 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 f0779a8f1..f663d4e57 100644
--- 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