Switch to external frozenlist and aiosignal libraries (#5293)

aio-libs · Nov 27, 2020 · 9f659ca · 9f659ca
1 parent aa11d78
commit 9f659ca
Show file tree

Hide file tree

Showing 17 changed files with 17 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
@@ -77,7 +77,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
@@ -14,6 +14,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
 
@@ -26,7 +27,6 @@
 from .client_ws import ClientWebSocketResponse
 from .helpers import _SENTINEL, 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 types import SimpleNamespace
 from typing import TYPE_CHECKING, Awaitable, Optional, Type, TypeVar
 
+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,12 +22,12 @@
     cast,
 )
 
+from aiosignal import Signal
+from frozenlist import FrozenList
 from typing_extensions import final
 
 from . import hdrs
-from .frozenlist import FrozenList
 from .log import web_logger
-from .signals import Signal
 from .web_middlewares import _fix_request_current_app
 from .web_request import Request
 from .web_response import StreamResponse

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -1,11 +1,13 @@
 -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-timeout==4.0.0a3
 asynctest==0.13.0; python_version<"3.8"
 Brotli==1.0.9
 cchardet==2.1.7
 chardet==3.0.4
+frozenlist==1.1.1
 gunicorn==20.0.4
 typing_extensions==3.7.4.3
 uvloop==0.14.0; platform_system!="Windows" and implementation_name=="cpython" and python_version<"3.9" # MagicStack/uvloop#14

diff --git a/setup.py b/setup.py
@@ -38,7 +38,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"]),
 ]
@@ -57,6 +56,8 @@
     'asynctest==0.13.0; python_version<"3.8"',
     "yarl>=1.0,<2.0",
     "typing_extensions>=3.7.4",
+    "frozenlist>=1.1.1",
+    "aiosignal>=1.1.2",
 ]