Skip to content

Commit 3c1746d

Browse files
authored
Web protocol cleanup (#2500)
* Drop deprecated slow_request_timeout param * Drop **kwargs eager devourer from web protocol * Drop slow_request_timeout from docs * Add changelog
1 parent 5f4ba9f commit 3c1746d

File tree

4 files changed

+3
-13
lines changed

4 files changed

+3
-13
lines changed

CHANGES/2500.removal

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Drop deprecated `slow_request_timeout` param and `**kwargs`` from
2+
`RequestHandler`.

aiohttp/web_protocol.py

+1-7
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import http.server
44
import socket
55
import traceback
6-
import warnings
76
from collections import deque
87
from contextlib import suppress
98
from html import escape as html_escape
@@ -84,7 +83,6 @@ class RequestHandler(asyncio.streams.FlowControlMixin, asyncio.Protocol):
8483
def __init__(self, manager, *, loop=None,
8584
keepalive_timeout=75, # NGINX default value is 75 secs
8685
tcp_keepalive=True,
87-
slow_request_timeout=None,
8886
logger=server_logger,
8987
access_log_class=helpers.AccessLogger,
9088
access_log=access_logger,
@@ -94,11 +92,7 @@ def __init__(self, manager, *, loop=None,
9492
max_headers=32768,
9593
max_field_size=8190,
9694
lingering_time=10.0,
97-
max_concurrent_handlers=1,
98-
**kwargs):
99-
if slow_request_timeout is not None:
100-
warnings.warn(
101-
'slow_request_timeout is deprecated', DeprecationWarning)
95+
max_concurrent_handlers=1):
10296

10397
super().__init__(loop=loop)
10498

docs/web_reference.rst

-1
Original file line numberDiff line numberDiff line change
@@ -1330,7 +1330,6 @@ duplicated like one using :meth:`Application.copy`.
13301330
:param bool tcp_keepalive: Enable TCP Keep-Alive. Default: ``True``.
13311331
:param int keepalive_timeout: Number of seconds before closing Keep-Alive
13321332
connection. Default: ``75`` seconds (NGINX's default value).
1333-
:param slow_request_timeout: Slow request timeout. Default: ``0``.
13341333
:param logger: Custom logger object. Default:
13351334
:data:`aiohttp.log.server_logger`.
13361335
:param access_log: Custom logging object. Default:

tests/test_web_protocol.py

-5
Original file line numberDiff line numberDiff line change
@@ -253,11 +253,6 @@ def test_srv_keep_alive(srv):
253253
assert not srv._keepalive
254254

255255

256-
def test_slow_request(make_srv):
257-
with pytest.warns(DeprecationWarning):
258-
make_srv(slow_request_timeout=0.01)
259-
260-
261256
async def test_simple(srv, loop, buf):
262257
srv.data_received(
263258
b'GET / HTTP/1.1\r\n\r\n')

0 commit comments

Comments
 (0)