Merge remote-tracking branch 'upstream/master'

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

diff --git a/src/nominatim_db/typing.py b/src/nominatim_db/typing.py
index f1abee8280691ea9e5737a9a46553b81e2edc01b..f26e1b0506b8b6ba96cecbe7bac28ff02bd30605 100644 (file)
--- a/src/nominatim_db/typing.py
+++ b/src/nominatim_db/typing.py
@@ -11,32 +11,24 @@ Complex type definitions are moved here, to keep the source files readable.
 """
 from typing import Any, Union, Mapping, TypeVar, Sequence, TYPE_CHECKING
 
 """
 from typing import Any, Union, Mapping, TypeVar, Sequence, TYPE_CHECKING
 

-# Generics variable names do not confirm to naming styles, ignore globally here.
-# pylint: disable=invalid-name,abstract-method,multiple-statements
-# pylint: disable=missing-class-docstring,useless-import-alias

 
 if TYPE_CHECKING:
 
 if TYPE_CHECKING:

-    import psycopg2.sql
-    import psycopg2.extensions
-    import psycopg2.extras

     import os
 
 StrPath = Union[str, 'os.PathLike[str]']
 
 SysEnv = Mapping[str, str]
 
     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)
 
 
 T_ResultKey = TypeVar('T_ResultKey', int, str)
 

+

 class DictCursorResult(Mapping[str, Any]):
     def __getitem__(self, x: Union[int, str]) -> Any: ...
 
 class DictCursorResult(Mapping[str, Any]):
     def __getitem__(self, x: Union[int, str]) -> Any: ...
 

-DictCursorResults = Sequence[DictCursorResult]

 
 

-T_cursor = TypeVar('T_cursor', bound='psycopg2.extensions.cursor')
+DictCursorResults = Sequence[DictCursorResult]

 
 # The following typing features require typing_extensions to work
 # on all supported Python versions.
 
 # The following typing features require typing_extensions to work
 # on all supported Python versions.