Fix imports of typing_extensions (#5374)

Co-authored-by: Sam Bull <git@sambull.org>

CHANGES/5107.bugfix

@@ -0,0 +1 @@
+Only depend on typing_extensions for Python <3.8

aiohttp/client.py

@@ -30,7 +30,6 @@
 
 import attr
 from multidict import CIMultiDict, MultiDict, MultiDictProxy, istr
-from typing_extensions import Final
 from yarl import URL
 
 from . import hdrs, http, payload
@@ -86,7 +85,7 @@
 from .http_websocket import WSHandshakeError, WSMessage, ws_ext_gen, ws_ext_parse
 from .streams import FlowControlDataQueue
 from .tracing import Trace, TraceConfig
-from .typedefs import JSONEncoder, LooseCookies, LooseHeaders, StrOrURL
+from .typedefs import Final, JSONEncoder, LooseCookies, LooseHeaders, StrOrURL
 
 __all__ = (
     # client_exceptions

aiohttp/hdrs.py

@@ -2,10 +2,15 @@
 
 # After changing the file content call ./tools/gen.py
 # to regenerate the headers parser
+import sys
 from typing import Set
 
 from multidict import istr
-from typing_extensions import Final
+
+if sys.version_info >= (3, 8):
+    from typing import Final
+else:
+    from typing_extensions import Final
 
 METH_ANY: Final[str] = "*"
 METH_CONNECT: Final[str] = "CONNECT"

aiohttp/helpers.py

@@ -23,6 +23,7 @@
 from typing import (
     Any,
     Callable,
+    ContextManager,
     Dict,
     Generator,
     Generic,
@@ -45,12 +46,11 @@
 import async_timeout
 import attr
 from multidict import MultiDict, MultiDictProxy
-from typing_extensions import Protocol
 from yarl import URL
 
 from . import hdrs
 from .log import client_logger, internal_logger
-from .typedefs import PathLike  # noqa
+from .typedefs import PathLike, Protocol  # noqa
 
 __all__ = ("BasicAuth", "ChainMapProxy")
 
@@ -63,11 +63,6 @@
 
     idna_ssl.patch_match_hostname()
 
-try:
-    from typing import ContextManager
-except ImportError:
-    from typing_extensions import ContextManager
-
 
 def all_tasks(
     loop: Optional[asyncio.AbstractEventLoop] = None,

aiohttp/http_parser.py

@@ -22,7 +22,6 @@
 )
 
 from multidict import CIMultiDict, CIMultiDictProxy, istr
-from typing_extensions import Final
 from yarl import URL
 
 from . import hdrs
@@ -39,7 +38,7 @@
 from .http_writer import HttpVersion, HttpVersion10
 from .log import internal_logger
 from .streams import EMPTY_PAYLOAD, StreamReader
-from .typedefs import RawHeaders
+from .typedefs import Final, RawHeaders
 
 try:
     import brotli

aiohttp/http_websocket.py

@@ -11,11 +11,10 @@
 from struct import Struct
 from typing import Any, Callable, List, Optional, Pattern, Set, Tuple, Union, cast
 
-from typing_extensions import Final
-
 from .base_protocol import BaseProtocol
 from .helpers import NO_EXTENSIONS
 from .streams import DataQueue
+from .typedefs import Final
 
 __all__ = (
     "WS_CLOSED_MESSAGE",

aiohttp/locks.py

@@ -1,11 +1,6 @@
 import asyncio
 import collections
-from typing import Any, Optional
-
-try:
-    from typing import Deque
-except ImportError:
-    from typing_extensions import Deque
+from typing import Any, Deque, Optional
 
 
 class EventResultOrError:

aiohttp/payload.py

@@ -23,7 +23,6 @@
 )
 
 from multidict import CIMultiDict
-from typing_extensions import Final
 
 from . import hdrs
 from .abc import AbstractStreamWriter
@@ -35,7 +34,7 @@
     sentinel,
 )
 from .streams import StreamReader
-from .typedefs import JSONEncoder, _CIMultiDict
+from .typedefs import Final, JSONEncoder, _CIMultiDict
 
 __all__ = (
     "PAYLOAD_REGISTRY",

aiohttp/streams.py

@@ -1,18 +1,12 @@
 import asyncio
 import collections
 import warnings
-from typing import Awaitable, Callable, Generic, List, Optional, Tuple, TypeVar
-
-from typing_extensions import Final
+from typing import Awaitable, Callable, Deque, Generic, List, Optional, Tuple, TypeVar
 
 from .base_protocol import BaseProtocol
 from .helpers import BaseTimerContext, set_exception, set_result
 from .log import internal_logger
-
-try:  # pragma: no cover
-    from typing import Deque
-except ImportError:
-    from typing_extensions import Deque
+from .typedefs import Final
 
 __all__ = (
     "EMPTY_PAYLOAD",

aiohttp/tracing.py

@@ -9,9 +9,8 @@
 from .client_reqrep import ClientResponse
 
 if TYPE_CHECKING:  # pragma: no cover
-    from typing_extensions import Protocol
-
     from .client import ClientSession
+    from .typedefs import Protocol
 
     _ParamT_contra = TypeVar("_ParamT_contra", contravariant=True)
 

aiohttp/typedefs.py

@@ -7,6 +7,16 @@
 from multidict import CIMultiDict, CIMultiDictProxy, MultiDict, MultiDictProxy, istr
 from yarl import URL
 
+# These are for other modules to use (to avoid repeating the conditional import).
+if sys.version_info >= (3, 8):
+    from typing import Final as Final, Protocol as Protocol, TypedDict as TypedDict
+else:
+    from typing_extensions import (  # noqa: F401
+        Final,
+        Protocol as Protocol,
+        TypedDict as TypedDict,
+    )
+
 DEFAULT_JSON_ENCODER = json.dumps
 DEFAULT_JSON_DECODER = json.loads
 

aiohttp/web_fileresponse.py

@@ -15,11 +15,9 @@
     cast,
 )
 
-from typing_extensions import Final
-
 from . import hdrs
 from .abc import AbstractStreamWriter
-from .typedefs import LooseHeaders
+from .typedefs import Final, LooseHeaders
 from .web_exceptions import (
     HTTPNotModified,
     HTTPPartialContent,

aiohttp/web_request.py

@@ -27,7 +27,6 @@
 
 import attr
 from multidict import CIMultiDict, CIMultiDictProxy, MultiDict, MultiDictProxy
-from typing_extensions import Final
 from yarl import URL
 
 from . import hdrs
@@ -39,6 +38,7 @@
 from .streams import EmptyStreamReader, StreamReader
 from .typedefs import (
     DEFAULT_JSON_DECODER,
+    Final,
     JSONDecoder,
     LooseHeaders,
     RawHeaders,

aiohttp/web_urldispatcher.py

@@ -33,14 +33,13 @@
     cast,
 )
 
-from typing_extensions import Final, TypedDict
 from yarl import URL, __version__ as yarl_version  # type: ignore[attr-defined]
 
 from . import hdrs
 from .abc import AbstractMatchInfo, AbstractRouter, AbstractView
 from .helpers import DEBUG
 from .http import HttpVersion11
-from .typedefs import PathLike
+from .typedefs import Final, PathLike, TypedDict
 from .web_exceptions import (
     HTTPException,
     HTTPExpectationFailed,

aiohttp/web_ws.py

@@ -8,7 +8,6 @@
 import async_timeout
 import attr
 from multidict import CIMultiDict
-from typing_extensions import Final
 
 from . import hdrs
 from .abc import AbstractStreamWriter
@@ -28,7 +27,7 @@
 )
 from .log import ws_logger
 from .streams import EofStream, FlowControlDataQueue
-from .typedefs import JSONDecoder, JSONEncoder
+from .typedefs import Final, JSONDecoder, JSONEncoder
 from .web_exceptions import HTTPBadRequest, HTTPException
 from .web_request import BaseRequest
 from .web_response import StreamResponse

setup.py

@@ -70,7 +70,7 @@ def build_extension(self, ext):
     'asynctest==0.13.0; python_version<"3.8"',
     "yarl>=1.0,<2.0",
     'idna-ssl>=1.0; python_version<"3.7"',
-    "typing_extensions>=3.7.4",
+    'typing_extensions>=3.7.4; python_version<"3.8"',
     "frozenlist>=1.1.1",
     "aiosignal>=1.1.2",
 ]