Only install async-timeout for Python < 3.11 (#7556)

## What do these changes do?
Replace `async-timeout` with `asyncio.timeout` for Python 3.11+.

Overall the change isn't as clean as I would have liked it to be. That's
mostly a result of the name conflict with `timeout`. I'm open for
suggestions on how to improve it.

## Are there changes in behavior for the user?
`async-timeout` won't be a dependency for Python 3.11+ any longer.

## Related issue number

Fixes: #7502

Author: cdce8p

CHANGES/7502.feature

@@ -0,0 +1 @@
+Only install async-timeout for Python < 3.11.

aiohttp/client_ws.py

@@ -2,10 +2,9 @@
 
 import asyncio
 import dataclasses
+import sys
 from typing import Any, Final, Optional, cast
 
-import async_timeout
-
 from .client_exceptions import ClientError
 from .client_reqrep import ClientResponse
 from .helpers import call_later, set_result
@@ -26,6 +25,11 @@
     JSONEncoder,
 )
 
+if sys.version_info >= (3, 11):
+    import asyncio as async_timeout
+else:
+    import async_timeout
+
 
 @dataclasses.dataclass(frozen=True)
 class ClientWSTimeout:

aiohttp/helpers.py

@@ -50,14 +50,18 @@
 from urllib.parse import quote
 from urllib.request import getproxies, proxy_bypass
 
-import async_timeout
 from multidict import CIMultiDict, MultiDict, MultiDictProxy
 from yarl import URL
 
 from . import hdrs
 from .log import client_logger
 from .typedefs import PathLike  # noqa
 
+if sys.version_info >= (3, 11):
+    import asyncio as async_timeout
+else:
+    import async_timeout
+
 __all__ = ("BasicAuth", "ChainMapProxy", "ETag")
 
 PY_310 = sys.version_info >= (3, 10)

aiohttp/web_ws.py

@@ -4,9 +4,9 @@
 import dataclasses
 import hashlib
 import json
+import sys
 from typing import Any, Final, Iterable, Optional, Tuple, cast
 
-import async_timeout
 from multidict import CIMultiDict
 
 from . import hdrs
@@ -32,6 +32,11 @@
 from .web_request import BaseRequest
 from .web_response import StreamResponse
 
+if sys.version_info >= (3, 11):
+    import asyncio as async_timeout
+else:
+    import async_timeout
+
 __all__ = (
     "WebSocketResponse",
     "WebSocketReady",

requirements/base.txt

@@ -8,7 +8,7 @@ aiodns==3.0.0 ; sys_platform == "linux" or sys_platform == "darwin"
     # via -r requirements/runtime-deps.in
 aiosignal==1.3.1
     # via -r requirements/runtime-deps.in
-async-timeout==4.0.3
+async-timeout==4.0.3 ; python_version < "3.11"
     # via -r requirements/runtime-deps.in
 brotli==1.0.9
     # via -r requirements/runtime-deps.in

requirements/constraints.txt

@@ -14,7 +14,7 @@ aiosignal==1.3.1
     # via -r requirements/runtime-deps.in
 alabaster==0.7.13
     # via sphinx
-async-timeout==4.0.3
+async-timeout==4.0.3 ; python_version < "3.11"
     # via
     #   -r requirements/runtime-deps.in
     #   aioredis

requirements/dev.txt

@@ -14,7 +14,7 @@ aiosignal==1.3.1
     # via -r requirements/runtime-deps.in
 alabaster==0.7.13
     # via sphinx
-async-timeout==4.0.3
+async-timeout==4.0.3 ; python_version < "3.11"
     # via
     #   -r requirements/runtime-deps.in
     #   aioredis

requirements/lint.txt

@@ -6,7 +6,7 @@
 #
 aioredis==2.0.1
     # via -r requirements/lint.in
-async-timeout==4.0.3
+async-timeout==4.0.3 ; python_version < "3.11"
     # via aioredis
 cfgv==3.3.1
     # via pre-commit

requirements/runtime-deps.in

@@ -2,7 +2,7 @@
 
 charset-normalizer >=2.0, < 4.0
 multidict >=4.5, < 7.0
-async-timeout >= 4.0, < 5.0
+async-timeout >= 4.0, < 5.0 ; python_version < "3.11"
 yarl >= 1.0, < 2.0
 frozenlist >= 1.1.1
 aiosignal >= 1.1.2

requirements/runtime-deps.txt

@@ -8,7 +8,7 @@ aiodns==3.0.0 ; sys_platform == "linux" or sys_platform == "darwin"
     # via -r requirements/runtime-deps.in
 aiosignal==1.3.1
     # via -r requirements/runtime-deps.in
-async-timeout==4.0.3
+async-timeout==4.0.3 ; python_version < "3.11"
     # via -r requirements/runtime-deps.in
 brotli==1.0.9
     # via -r requirements/runtime-deps.in

requirements/test.txt

@@ -8,7 +8,7 @@ aiodns==3.0.0 ; sys_platform == "linux" or sys_platform == "darwin"
     # via -r requirements/runtime-deps.in
 aiosignal==1.3.1
     # via -r requirements/runtime-deps.in
-async-timeout==4.0.3
+async-timeout==4.0.3 ; python_version < "3.11"
     # via -r requirements/runtime-deps.in
 brotli==1.0.9
     # via -r requirements/runtime-deps.in

setup.cfg

@@ -49,7 +49,7 @@ include_package_data = True
 install_requires =
   charset-normalizer >=2.0, < 4.0
   multidict >=4.5, < 7.0
-  async-timeout >= 4.0, < 5.0
+  async-timeout >= 4.0, < 5.0 ; python_version < "3.11"
   yarl >= 1.0, < 2.0
   frozenlist >= 1.1.1
   aiosignal >= 1.1.2

tests/test_client_ws_functional.py

@@ -1,14 +1,19 @@
 # type: ignore
 import asyncio
+import sys
 from typing import Any
 
-import async_timeout
 import pytest
 
 import aiohttp
 from aiohttp import hdrs, web
 from aiohttp.client_ws import ClientWSTimeout
 
+if sys.version_info >= (3, 11):
+    import asyncio as async_timeout
+else:
+    import async_timeout
+
 
 async def test_send_recv_text(aiohttp_client: Any) -> None:
     async def handler(request):

tests/test_helpers.py

@@ -4,6 +4,7 @@
 import datetime
 import gc
 import platform
+import sys
 import weakref
 from math import ceil, modf
 from pathlib import Path
@@ -448,25 +449,37 @@ def test_ceil_call_later_no_timeout() -> None:
 
 async def test_ceil_timeout_none(loop) -> None:
     async with helpers.ceil_timeout(None) as cm:
-        assert cm.deadline is None
+        if sys.version_info >= (3, 11):
+            assert cm.when() is None
+        else:
+            assert cm.deadline is None
 
 
 async def test_ceil_timeout_round(loop) -> None:
     async with helpers.ceil_timeout(7.5) as cm:
-        frac, integer = modf(cm.deadline)
+        if sys.version_info >= (3, 11):
+            frac, integer = modf(cm.when())
+        else:
+            frac, integer = modf(cm.deadline)
         assert frac == 0
 
 
 async def test_ceil_timeout_small(loop) -> None:
     async with helpers.ceil_timeout(1.1) as cm:
-        frac, integer = modf(cm.deadline)
+        if sys.version_info >= (3, 11):
+            frac, integer = modf(cm.when())
+        else:
+            frac, integer = modf(cm.deadline)
         # a chance for exact integer with zero fraction is negligible
         assert frac != 0
 
 
 async def test_ceil_timeout_small_with_overriden_threshold(loop) -> None:
     async with helpers.ceil_timeout(1.5, ceil_threshold=1) as cm:
-        frac, integer = modf(cm.deadline)
+        if sys.version_info >= (3, 11):
+            frac, integer = modf(cm.when())
+        else:
+            frac, integer = modf(cm.deadline)
         assert frac == 0