From 2fd61f9fa3cdc0e7507ef9cc7216ff9590d9d14b Mon Sep 17 00:00:00 2001 From: Diogo Dutra Date: Sat, 13 Apr 2019 12:39:31 -0300 Subject: [PATCH] Adjust type annotations making print arg optional in web.run_app() PR #3690 by @dutradda Backport to 3.9 to fix #7077. Upgrade isort 5.11.4 for poetry compatibility fix PyCQA/isort#2077 (cherry picked from commit baddbfe182a5731d5963438f317cbcce4c094f39) --- .pre-commit-config.yaml | 2 +- CHANGES/3690.misc | 1 + CONTRIBUTORS.txt | 1 + aiohttp/web.py | 4 ++-- 4 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 CHANGES/3690.misc diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c1e92815b68..7e729eec085 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -30,7 +30,7 @@ repos: hooks: - id: yesqa - repo: https://github.com/PyCQA/isort - rev: '5.9.3' + rev: '5.11.5' hooks: - id: isort - repo: https://github.com/psf/black diff --git a/CHANGES/3690.misc b/CHANGES/3690.misc new file mode 100644 index 00000000000..51245f99f8c --- /dev/null +++ b/CHANGES/3690.misc @@ -0,0 +1 @@ +Do print argument optional on run_app function diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 7c633b30169..dae2f273663 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -90,6 +90,7 @@ Denis Moshensky Dennis Kliban Dima Veselov Dimitar Dimitrov +Diogo Dutra da Mata Dmitriy Safonov Dmitry Doroshev Dmitry Erlikh diff --git a/aiohttp/web.py b/aiohttp/web.py index b2f780b0a0c..4db66cda8bd 100644 --- a/aiohttp/web.py +++ b/aiohttp/web.py @@ -299,7 +299,7 @@ async def _run_app( shutdown_timeout: float = 60.0, keepalive_timeout: float = 75.0, ssl_context: Optional[SSLContext] = None, - print: Callable[..., None] = print, + print: Optional[Callable[..., None]] = print, backlog: int = 128, access_log_class: Type[AbstractAccessLogger] = AccessLogger, access_log_format: str = AccessLogger.LOG_FORMAT, @@ -474,7 +474,7 @@ def run_app( shutdown_timeout: float = 60.0, keepalive_timeout: float = 75.0, ssl_context: Optional[SSLContext] = None, - print: Callable[..., None] = print, + print: Optional[Callable[..., None]] = print, backlog: int = 128, access_log_class: Type[AbstractAccessLogger] = AccessLogger, access_log_format: str = AccessLogger.LOG_FORMAT,