[3.8] Switch to external frozenlist and aiosignal libraries (#5293).

(cherry picked from commit 9f659ca) Co-authored-by: Andrew Svetlov <andrew.svetlov@gmail.com>
aio-libs · Nov 27, 2020 · 6530d39 · 6530d39
1 parent 71b9394
commit 6530d39
Show file tree

Hide file tree

Showing 18 changed files with 22 additions and 686 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,8 +34,6 @@
 .vimrc
 .vscode
 aiohttp/_find_header.c
-aiohttp/_frozenlist.c
-aiohttp/_frozenlist.html
 aiohttp/_headers.html
 aiohttp/_headers.pxi
 aiohttp/_helpers.c

diff --git a/CHANGES/5293.feature b/CHANGES/5293.feature
@@ -0,0 +1 @@
+Switch to external frozenlist and aiosignal libraries.
diff --git a/aiohttp/__init__.py b/aiohttp/__init__.py
@@ -78,7 +78,6 @@
     DefaultResolver as DefaultResolver,
     ThreadedResolver as ThreadedResolver,
 )
-from .signals import Signal as Signal
 from .streams import (
     EMPTY_PAYLOAD as EMPTY_PAYLOAD,
     DataQueue as DataQueue,

diff --git a/aiohttp/_frozenlist.pyx b/aiohttp/_frozenlist.pyx
diff --git a/aiohttp/frozenlist.py b/aiohttp/frozenlist.py
diff --git a/aiohttp/frozenlist.pyi b/aiohttp/frozenlist.pyi
diff --git a/aiohttp/signals.py b/aiohttp/signals.py
diff --git a/aiohttp/signals.pyi b/aiohttp/signals.pyi
diff --git a/aiohttp/test_utils.py b/aiohttp/test_utils.py
@@ -13,6 +13,7 @@
 from typing import TYPE_CHECKING, Any, Callable, Iterator, List, Optional, Type, Union
 from unittest import mock
 
+from aiosignal import Signal
 from multidict import CIMultiDict, CIMultiDictProxy
 from yarl import URL
 
@@ -25,7 +26,6 @@
 from .client_ws import ClientWebSocketResponse
 from .helpers import PY_38, sentinel
 from .http import HttpVersion, RawRequestMessage
-from .signals import Signal
 from .web import (
     Application,
     AppRunner,

diff --git a/aiohttp/tracing.py b/aiohttp/tracing.py
@@ -2,11 +2,11 @@
 from typing import TYPE_CHECKING, Awaitable, Optional, Type, TypeVar
 
 import attr
+from aiosignal import Signal
 from multidict import CIMultiDict
 from yarl import URL
 
 from .client_reqrep import ClientResponse
-from .signals import Signal
 
 if TYPE_CHECKING:  # pragma: no cover
     from typing_extensions import Protocol

diff --git a/aiohttp/web_app.py b/aiohttp/web_app.py
@@ -22,18 +22,19 @@
     cast,
 )
 
+from aiosignal import Signal
+from frozenlist import FrozenList
+
 from . import hdrs
 from .abc import (
     AbstractAccessLogger,
     AbstractMatchInfo,
     AbstractRouter,
     AbstractStreamWriter,
 )
-from .frozenlist import FrozenList
 from .helpers import DEBUG
 from .http_parser import RawRequestMessage
 from .log import web_logger
-from .signals import Signal
 from .streams import StreamReader
 from .web_log import AccessLogger
 from .web_middlewares import _fix_request_current_app

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -1,13 +1,15 @@
 -r multidict.txt
 # required c-ares will not build on windows and has build problems on Macos Python<3.7
 aiodns==2.0.0; sys_platform=="linux" or sys_platform=="darwin" and python_version>="3.7"
+aiosignal==1.1.2
 async-generator==1.10
 async-timeout==3.0.1
 asynctest==0.13.0; python_version<"3.8"
 attrs==20.3.0
 brotlipy==0.7.0
 cchardet==2.1.7
 chardet==3.0.4
+frozenlist==1.1.1
 gunicorn==20.0.4
 idna-ssl==1.1.0; python_version<"3.7"
 typing_extensions==3.7.4.3

diff --git a/setup.py b/setup.py
@@ -31,7 +31,6 @@
         ],
         define_macros=[("HTTP_PARSER_STRICT", 0)],
     ),
-    Extension("aiohttp._frozenlist", ["aiohttp/_frozenlist.c"]),
     Extension("aiohttp._helpers", ["aiohttp/_helpers.c"]),
     Extension("aiohttp._http_writer", ["aiohttp/_http_writer.c"]),
 ]
@@ -71,7 +70,9 @@ 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.6.5",
+    "typing_extensions>=3.7.4",
+    "frozenlist>=1.1.1",
+    "aiosignal>=1.1.2",
 ]