Fixes

tests/conftest.py

@@ -1,3 +1,5 @@
+from __future__ import annotations  # TODO(PY311): Remove
+
 import asyncio
 import base64
 import os
@@ -8,18 +10,17 @@
 from http.cookies import BaseCookie
 from pathlib import Path
 from tempfile import TemporaryDirectory
 from typing import (
     Any,
     AsyncIterator,
     Callable,
     Generator,
     Iterable,
     Iterator,
     Optional,
     TypedDict,
     Union,
-    Unpack,
 )
 from unittest import mock
 from uuid import uuid4
 
@@ -37,18 +38,18 @@
 from aiohttp import payload
 from aiohttp.client import ClientSession
 from aiohttp.client_proto import ResponseHandler
 from aiohttp.client_reqrep import (
     ClientRequest,
     ClientRequestArgs,
     ClientResponse,
     Fingerprint,
 )
 from aiohttp.compression_utils import ZLibBackend, ZLibBackendProtocol, set_zlib_backend
 from aiohttp.helpers import BaseTimerContext, BasicAuth, TimerNoop
 from aiohttp.http import WS_KEY, HttpVersion, HttpVersion11
 from aiohttp.test_utils import get_unused_port_socket, loop_context
 from aiohttp.tracing import Trace
 from aiohttp.typedefs import Query
 
 try:
     import trustme
@@ -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
 
@@ -39,12 +38,17 @@
 from aiohttp.compression_utils import ZLibBackend
 from aiohttp.connector import Connection
 from aiohttp.hdrs import METH_DELETE
 from aiohttp.helpers import TimerNoop
 from aiohttp.http import HttpVersion, HttpVersion10, HttpVersion11, StreamWriter
 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

@@ -11,7 +11,7 @@
 from collections import defaultdict, deque
 from concurrent import futures
 from contextlib import closing, suppress
 from http.cookies import BaseCookie
 from typing import (
     Any,
     Awaitable,
@@ -25,12 +25,11 @@
     Optional,
     Sequence,
     Tuple,
-    Unpack,
 )
 from unittest import mock
 
 import pytest
 from multidict import CIMultiDict
 from pytest_mock import MockerFixture
 from yarl import URL
 
@@ -56,12 +55,17 @@
     _ConnectTunnelConnection,
     _DNSCacheTable,
 )
 from aiohttp.helpers import TimerNoop
 from aiohttp.pytest_plugin import AiohttpClient, AiohttpServer
 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

@@ -17,9 +17,14 @@
 )
 from aiohttp.connector import _SSL_CONTEXT_VERIFIED
 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")