From d630cdea3fc90d28645fcea47158600b466fe2a0 Mon Sep 17 00:00:00 2001 From: Nickolay Tiunov Date: Wed, 8 Dec 2021 22:30:27 +0300 Subject: [PATCH 1/4] Edited the web.run_app declaration. The run_app function takes the "sock" parameter which can be iterable as well. --- aiohttp/web.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aiohttp/web.py b/aiohttp/web.py index 5aef0c00e5f..2dc0914709f 100644 --- a/aiohttp/web.py +++ b/aiohttp/web.py @@ -289,7 +289,7 @@ async def _run_app( host: Optional[Union[str, HostSequence]] = None, port: Optional[int] = None, path: Optional[str] = None, - sock: Optional[socket.socket] = None, + sock: Optional[Union[socket.socket, Iterable[socket.socket]]] = None, shutdown_timeout: float = 60.0, keepalive_timeout: float = 75.0, ssl_context: Optional[SSLContext] = None, @@ -463,7 +463,7 @@ def run_app( host: Optional[Union[str, HostSequence]] = None, port: Optional[int] = None, path: Optional[str] = None, - sock: Optional[socket.socket] = None, + sock: Optional[Union[socket.socket, Iterable[socket.socket]]] = None, shutdown_timeout: float = 60.0, keepalive_timeout: float = 75.0, ssl_context: Optional[SSLContext] = None, From 71af7fd24100e5046d06826dd0411bfa61f2126b Mon Sep 17 00:00:00 2001 From: Nickolay Tiunov Date: Wed, 8 Dec 2021 22:42:14 +0300 Subject: [PATCH 2/4] Updated CONTRIBUTORS.txt. --- CONTRIBUTORS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 903c87af870..d8be9a57a0f 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -234,6 +234,7 @@ Navid Sheikhol Nicolas Braem Nikolay Kim Nikolay Novik +Nikolay Tiunov Nándor Mátravölgyi Oisin Aylward Olaf Conradi From 923630ac0d2ab2c8a88884d0502deb7aad2e6289 Mon Sep 17 00:00:00 2001 From: Nickolay Tiunov Date: Wed, 8 Dec 2021 22:42:40 +0300 Subject: [PATCH 3/4] Added description to CHANGES. --- CHANGES/6401.doc | 1 + 1 file changed, 1 insertion(+) create mode 100644 CHANGES/6401.doc diff --git a/CHANGES/6401.doc b/CHANGES/6401.doc new file mode 100644 index 00000000000..5920747db3a --- /dev/null +++ b/CHANGES/6401.doc @@ -0,0 +1 @@ +Edited the web.run_app declaration. From 62913cd7fc685e8605f9722c8e3b71e44b70559c Mon Sep 17 00:00:00 2001 From: Nickolay Tiunov Date: Thu, 9 Dec 2021 16:44:10 +0300 Subject: [PATCH 4/4] Use TypingIterable instead of Iterable. --- aiohttp/web.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aiohttp/web.py b/aiohttp/web.py index 2dc0914709f..d6f43b4a4f2 100644 --- a/aiohttp/web.py +++ b/aiohttp/web.py @@ -289,7 +289,7 @@ async def _run_app( host: Optional[Union[str, HostSequence]] = None, port: Optional[int] = None, path: Optional[str] = None, - sock: Optional[Union[socket.socket, Iterable[socket.socket]]] = None, + sock: Optional[Union[socket.socket, TypingIterable[socket.socket]]] = None, shutdown_timeout: float = 60.0, keepalive_timeout: float = 75.0, ssl_context: Optional[SSLContext] = None, @@ -463,7 +463,7 @@ def run_app( host: Optional[Union[str, HostSequence]] = None, port: Optional[int] = None, path: Optional[str] = None, - sock: Optional[Union[socket.socket, Iterable[socket.socket]]] = None, + sock: Optional[Union[socket.socket, TypingIterable[socket.socket]]] = None, shutdown_timeout: float = 60.0, keepalive_timeout: float = 75.0, ssl_context: Optional[SSLContext] = None,