Fixes

Author: Dreamsorcerer

tests/conftest.py

@@ -1,3 +1,5 @@
+from __future__ import annotations  # TODO(PY311): Remove
+
 import asyncio
 import base64
 import os
@@ -18,7 +20,6 @@
     Optional,
     TypedDict,
     Union,
-    Unpack,
 )
 from unittest import mock
 from uuid import uuid4
@@ -69,6 +70,11 @@
 except ImportError:
     uvloop = None  # type: ignore[assignment]
 
+if sys.version_info >= (3, 11):
+    from typing import Unpack
+else:
+    from typing import Any as Unpack
+
 
 pytest_plugins = ("aiohttp.pytest_plugin", "pytester")
 

tests/test_benchmarks_client_request.py

@@ -2,7 +2,7 @@
 
 import asyncio
 from http.cookies import BaseCookie
-from typing import Any, Callable, Union, Unpack
+from typing import Any, Callable, Union
 
 from multidict import CIMultiDict
 from pytest_codspeed import BenchmarkFixture
@@ -14,6 +14,13 @@
 from aiohttp.http_writer import HttpVersion11
 from aiohttp.tracing import Trace
 
+if sys.version_info >= (3, 11):
+    from typing import Unpack
+
+    _RequestMaker = Callable[[str, URL, Unpack[ClientRequestArgs]], ClientRequest]
+else:
+    _RequestMaker = Any
+
 
 def test_client_request_update_cookies(
     loop: asyncio.AbstractEventLoop,

tests/test_client_request.py

@@ -16,7 +16,6 @@
     Optional,
     Protocol,
     Union,
-    Unpack,
 )
 from unittest import mock
 
@@ -44,7 +43,12 @@
 from aiohttp.multipart import MultipartWriter
 from aiohttp.typedefs import LooseCookies
 
-_RequestMaker = Callable[[str, URL, Unpack[ClientRequestArgs]], ClientRequest]
+if sys.version_info >= (3, 11):
+    from typing import Unpack
+
+    _RequestMaker = Callable[[str, URL, Unpack[ClientRequestArgs]], ClientRequest]
+else:
+    _RequestMaker = Any
 
 
 class WriterMock(mock.AsyncMock):

tests/test_connector.py

@@ -25,7 +25,6 @@
     Optional,
     Sequence,
     Tuple,
-    Unpack,
 )
 from unittest import mock
 
@@ -61,7 +60,12 @@
 from aiohttp.test_utils import unused_port
 from aiohttp.tracing import Trace
 
-_RequestMaker = Callable[[str, URL, Unpack[ClientRequestArgs]], ClientRequest]
+if sys.version_info >= (3, 11):
+    from typing import Unpack
+
+    _RequestMaker = Callable[[str, URL, Unpack[ClientRequestArgs]], ClientRequest]
+else:
+    _RequestMaker = Any
 
 
 @pytest.fixture

tests/test_proxy.py

@@ -19,7 +19,12 @@
 from aiohttp.helpers import TimerNoop
 from aiohttp.http import HttpVersion
 
-_RequestMaker = Callable[[str, URL, Unpack[ClientRequestArgs]], ClientRequest]
+if sys.version_info >= (3, 11):
+    from typing import Unpack
+
+    _RequestMaker = Callable[[str, URL, Unpack[ClientRequestArgs]], ClientRequest]
+else:
+    _RequestMaker = Any
 
 
 @mock.patch("aiohttp.connector.ClientRequest")