From 9cc1bb26a6a78c14c13c043855e4856e6f92a714 Mon Sep 17 00:00:00 2001 From: p1c2u Date: Tue, 17 Jan 2023 03:41:18 +0000 Subject: [PATCH] mypy typing module version fix --- openapi_core/contrib/requests/protocols.py | 14 +++++--------- openapi_core/schema/protocols.py | 14 +++++--------- openapi_core/validation/request/protocols.py | 14 +++++--------- openapi_core/validation/response/protocols.py | 14 +++++--------- 4 files changed, 20 insertions(+), 36 deletions(-) diff --git a/openapi_core/contrib/requests/protocols.py b/openapi_core/contrib/requests/protocols.py index 043c5a28..3c4ceaef 100644 --- a/openapi_core/contrib/requests/protocols.py +++ b/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 diff --git a/openapi_core/schema/protocols.py b/openapi_core/schema/protocols.py index a675db5c..e315c416 100644 --- a/openapi_core/schema/protocols.py +++ b/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 diff --git a/openapi_core/validation/request/protocols.py b/openapi_core/validation/request/protocols.py index 8a3ab254..bb527b19 100644 --- a/openapi_core/validation/request/protocols.py +++ b/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 diff --git a/openapi_core/validation/response/protocols.py b/openapi_core/validation/response/protocols.py index 6e42dce5..c8247854 100644 --- a/openapi_core/validation/response/protocols.py +++ b/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