Merge remote-tracking branch 'upstream/master'

[nominatim.git] / nominatim / typing.py

diff --git a/nominatim/typing.py b/nominatim/typing.py
index 36bde8347e7dd4fc8d94e9b9ea422f5ec1a77810..7914d73171a158474f0c5a993db3a4fb0d51424e 100644 (file)
--- a/nominatim/typing.py
+++ b/nominatim/typing.py
@@ -11,8 +11,9 @@ 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 varaible names do not confirm to naming styles, ignore globally here.
-# pylint: disable=invalid-name,abstract-method,multiple-statements,missing-class-docstring
+# 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:
     import psycopg2.sql
 
 if TYPE_CHECKING:
     import psycopg2.sql


@@ -36,3 +37,16 @@ class DictCursorResult(Mapping[str, Any]):
 DictCursorResults = Sequence[DictCursorResult]
 
 T_cursor = TypeVar('T_cursor', bound='psycopg2.extensions.cursor')
 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.
+
+if TYPE_CHECKING:
+    from typing_extensions import (Protocol as Protocol,
+                                   Final as Final,
+                                   TypedDict as TypedDict)
+else:
+    Protocol = object
+    Final = 'Final'
+    TypedDict = dict