Merge pull request #3521 from lonvia/make-requests-optional

[nominatim.git] / src / nominatim_db / typing.py

diff --git a/src/nominatim_db/typing.py b/src/nominatim_db/typing.py
index f1abee8280691ea9e5737a9a46553b81e2edc01b..6f0145c36e4d8753561476dcf61d3b55ad42f220 100644 (file)
--- a/src/nominatim_db/typing.py
+++ b/src/nominatim_db/typing.py
@@ -16,18 +16,13 @@ from typing import Any, Union, Mapping, TypeVar, Sequence, TYPE_CHECKING
 # pylint: disable=missing-class-docstring,useless-import-alias
 
 if TYPE_CHECKING:
-    import psycopg2.sql
-    import psycopg2.extensions
-    import psycopg2.extras
     import os
 
 StrPath = Union[str, 'os.PathLike[str]']
 
 SysEnv = Mapping[str, str]
 
-# psycopg2-related types
-
-Query = Union[str, bytes, 'psycopg2.sql.Composable']
+# psycopg-related types
 
 T_ResultKey = TypeVar('T_ResultKey', int, str)
 
@@ -36,8 +31,6 @@ class DictCursorResult(Mapping[str, Any]):
 
 DictCursorResults = Sequence[DictCursorResult]
 
-T_cursor = TypeVar('T_cursor', bound='psycopg2.extensions.cursor')
-
 # The following typing features require typing_extensions to work
 # on all supported Python versions.
 # Only require this for type checking but not for normal operations.