Merge pull request #464 from p1c2u/fix/mypy-typing-module-versions-fix

mypy typing module version fix

Author: p1c2u

openapi_core/contrib/requests/protocols.py

@@ -1,15 +1,11 @@
-from typing import TYPE_CHECKING
+import sys
 
-if TYPE_CHECKING:
+if sys.version_info >= (3, 8):
+    from typing import Protocol
+    from typing import runtime_checkable
+else:
     from typing_extensions import Protocol
     from typing_extensions import runtime_checkable
-else:
-    try:
-        from typing import Protocol
-        from typing import runtime_checkable
-    except ImportError:
-        from typing_extensions import Protocol
-        from typing_extensions import runtime_checkable
 
 from requests.cookies import RequestsCookieJar
 

openapi_core/schema/protocols.py

@@ -1,17 +1,13 @@
-from typing import TYPE_CHECKING
+import sys
 from typing import Any
 from typing import List
 
-if TYPE_CHECKING:
+if sys.version_info >= (3, 8):
+    from typing import Protocol
+    from typing import runtime_checkable
+else:
     from typing_extensions import Protocol
     from typing_extensions import runtime_checkable
-else:
-    try:
-        from typing import Protocol
-        from typing import runtime_checkable
-    except ImportError:
-        from typing_extensions import Protocol
-        from typing_extensions import runtime_checkable
 
 
 @runtime_checkable

openapi_core/validation/request/protocols.py

@@ -1,17 +1,13 @@
 """OpenAPI core validation request protocols module"""
-from typing import TYPE_CHECKING
+import sys
 from typing import Optional
 
-if TYPE_CHECKING:
+if sys.version_info >= (3, 8):
+    from typing import Protocol
+    from typing import runtime_checkable
+else:
     from typing_extensions import Protocol
     from typing_extensions import runtime_checkable
-else:
-    try:
-        from typing import Protocol
-        from typing import runtime_checkable
-    except ImportError:
-        from typing_extensions import Protocol
-        from typing_extensions import runtime_checkable
 
 from openapi_core.spec import Spec
 from openapi_core.validation.request.datatypes import RequestParameters

openapi_core/validation/response/protocols.py

@@ -1,19 +1,15 @@
 """OpenAPI core validation response protocols module"""
-from typing import TYPE_CHECKING
+import sys
 from typing import Any
 from typing import Mapping
 from typing import Optional
 
-if TYPE_CHECKING:
+if sys.version_info >= (3, 8):
+    from typing import Protocol
+    from typing import runtime_checkable
+else:
     from typing_extensions import Protocol
     from typing_extensions import runtime_checkable
-else:
-    try:
-        from typing import Protocol
-        from typing import runtime_checkable
-    except ImportError:
-        from typing_extensions import Protocol
-        from typing_extensions import runtime_checkable
 
 from openapi_core.spec import Spec
 from openapi_core.validation.request.protocols import Request