Backport #6903 (#7104)

Co-authored-by: Zainab Lawal <zainablaw1012@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

CHANGES/6903.misc

@@ -0,0 +1 @@
+Refactor code to use HTTPStatus instead of http.server to reduce import time

CONTRIBUTORS.txt

@@ -342,6 +342,7 @@ Yury Pliner
 Yury Selivanov
 Yusuke Tsutsumi
 Yuval Ofir
+Zainab Lawal
 Zeal Wierslee
 Zlatan Sičanica
 Марк Коренберг

aiohttp/connector.py

@@ -6,6 +6,7 @@
 import warnings
 from collections import defaultdict, deque
 from contextlib import suppress
+from http import HTTPStatus
 from http.cookies import SimpleCookie
 from itertools import cycle, islice
 from time import monotonic
@@ -53,7 +54,6 @@
     noop,
     sentinel,
 )
-from .http import RESPONSES
 from .locks import EventResultOrError
 from .resolver import DefaultResolver
 
@@ -1309,7 +1309,7 @@ async def _create_proxy_connection(
                     if resp.status != 200:
                         message = resp.reason
                         if message is None:
-                            message = RESPONSES[resp.status][0]
+                            message = HTTPStatus(resp.status).phrase
                         raise ClientHttpProxyError(
                             proxy_resp.request_info,
                             resp.history,

aiohttp/http.py

@@ -1,5 +1,5 @@
-import http.server
 import sys
+from http import HTTPStatus
 from typing import Mapping, Tuple
 
 from . import __version__
@@ -67,4 +67,6 @@
     sys.version_info, __version__
 )
 
-RESPONSES: Mapping[int, Tuple[str, str]] = http.server.BaseHTTPRequestHandler.responses
+RESPONSES: Mapping[int, Tuple[str, str]] = {
+    v: (v.phrase, v.description) for v in HTTPStatus.__members__.values()
+}

aiohttp/web_response.py

@@ -8,16 +8,15 @@
 import warnings
 import zlib
 from concurrent.futures import Executor
+from http import HTTPStatus
 from http.cookies import Morsel, SimpleCookie
 from typing import (
     TYPE_CHECKING,
     Any,
     Dict,
     Iterator,
-    Mapping,
     MutableMapping,
     Optional,
-    Tuple,
     Union,
     cast,
 )
@@ -37,7 +36,7 @@
     sentinel,
     validate_etag_value,
 )
-from .http import RESPONSES, SERVER_SOFTWARE, HttpVersion10, HttpVersion11
+from .http import SERVER_SOFTWARE, HttpVersion10, HttpVersion11
 from .payload import Payload
 from .typedefs import JSONEncoder, LooseHeaders
 
@@ -135,16 +134,15 @@ def set_status(
         self,
         status: int,
         reason: Optional[str] = None,
-        _RESPONSES: Mapping[int, Tuple[str, str]] = RESPONSES,
     ) -> None:
         assert not self.prepared, (
             "Cannot change the response status code after " "the headers have been sent"
         )
         self._status = int(status)
         if reason is None:
             try:
-                reason = _RESPONSES[self._status][0]
-            except Exception:
+                reason = HTTPStatus(self._status).phrase
+            except ValueError:
                 reason = ""
         self._reason = reason
 

tests/test_imports.py

@@ -59,4 +59,4 @@ def test_import_time(pytester: pytest.Pytester) -> None:
         else:
             os.environ["PYTHONPATH"] = old_path
 
-    assert best_time_ms < 250
+    assert best_time_ms < 200