From 274bfe403ffd743232d8eefe836d561851713edb Mon Sep 17 00:00:00 2001 From: Andrew Svetlov Date: Fri, 10 Nov 2017 06:21:16 +0200 Subject: [PATCH 1/4] Drop deprecated slow_request_timeout param --- aiohttp/web_protocol.py | 5 ----- tests/test_web_protocol.py | 5 ----- 2 files changed, 10 deletions(-) diff --git a/aiohttp/web_protocol.py b/aiohttp/web_protocol.py index d05621de141..8cc5cd37f2c 100644 --- a/aiohttp/web_protocol.py +++ b/aiohttp/web_protocol.py @@ -3,7 +3,6 @@ import http.server import socket import traceback -import warnings from collections import deque from contextlib import suppress from html import escape as html_escape @@ -84,7 +83,6 @@ class RequestHandler(asyncio.streams.FlowControlMixin, asyncio.Protocol): def __init__(self, manager, *, loop=None, keepalive_timeout=75, # NGINX default value is 75 secs tcp_keepalive=True, - slow_request_timeout=None, logger=server_logger, access_log_class=helpers.AccessLogger, access_log=access_logger, @@ -96,9 +94,6 @@ def __init__(self, manager, *, loop=None, lingering_time=10.0, max_concurrent_handlers=1, **kwargs): - if slow_request_timeout is not None: - warnings.warn( - 'slow_request_timeout is deprecated', DeprecationWarning) super().__init__(loop=loop) diff --git a/tests/test_web_protocol.py b/tests/test_web_protocol.py index d93c65510e9..b02cffa508f 100644 --- a/tests/test_web_protocol.py +++ b/tests/test_web_protocol.py @@ -253,11 +253,6 @@ def test_srv_keep_alive(srv): assert not srv._keepalive -def test_slow_request(make_srv): - with pytest.warns(DeprecationWarning): - make_srv(slow_request_timeout=0.01) - - async def test_simple(srv, loop, buf): srv.data_received( b'GET / HTTP/1.1\r\n\r\n') From 5e1c606c248f932ebc557d49d6931eba9127fb7d Mon Sep 17 00:00:00 2001 From: Andrew Svetlov Date: Fri, 10 Nov 2017 07:22:31 +0200 Subject: [PATCH 2/4] Drop **kwargs eager devourer from web protocol --- aiohttp/web_protocol.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/aiohttp/web_protocol.py b/aiohttp/web_protocol.py index 8cc5cd37f2c..94602ddd42b 100644 --- a/aiohttp/web_protocol.py +++ b/aiohttp/web_protocol.py @@ -92,8 +92,7 @@ def __init__(self, manager, *, loop=None, max_headers=32768, max_field_size=8190, lingering_time=10.0, - max_concurrent_handlers=1, - **kwargs): + max_concurrent_handlers=1): super().__init__(loop=loop) From 60b5cc4aceb4d192839481edd24f0e619bfdecd5 Mon Sep 17 00:00:00 2001 From: Andrew Svetlov Date: Fri, 10 Nov 2017 08:43:50 +0200 Subject: [PATCH 3/4] Drop slow_request_timeout from docs --- docs/web_reference.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/web_reference.rst b/docs/web_reference.rst index 299805c9a39..6dd9812d77b 100644 --- a/docs/web_reference.rst +++ b/docs/web_reference.rst @@ -1343,7 +1343,6 @@ duplicated like one using :meth:`Application.copy`. :param bool tcp_keepalive: Enable TCP Keep-Alive. Default: ``True``. :param int keepalive_timeout: Number of seconds before closing Keep-Alive connection. Default: ``75`` seconds (NGINX's default value). - :param slow_request_timeout: Slow request timeout. Default: ``0``. :param logger: Custom logger object. Default: :data:`aiohttp.log.server_logger`. :param access_log: Custom logging object. Default: From c82cac390bc8990de4d8455ac94e812034867ea2 Mon Sep 17 00:00:00 2001 From: Andrew Svetlov Date: Fri, 10 Nov 2017 10:04:22 +0200 Subject: [PATCH 4/4] Add changelog --- CHANGES/2500.removal | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 CHANGES/2500.removal diff --git a/CHANGES/2500.removal b/CHANGES/2500.removal new file mode 100644 index 00000000000..020f271c564 --- /dev/null +++ b/CHANGES/2500.removal @@ -0,0 +1,2 @@ +Drop deprecated `slow_request_timeout` param and `**kwargs`` from +`RequestHandler`.