From 2d5f396407f9ce3c19751d1b6205a0f04143d3d6 Mon Sep 17 00:00:00 2001 From: Codeb Fan Date: Mon, 2 Sep 2013 13:12:58 +0800 Subject: [PATCH] Remove `async_timeout` and use `connect_timeout` instead --- tornado/httpclient.py | 3 --- tornado/simple_httpclient.py | 2 +- tornado/test/simple_httpclient_test.py | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/tornado/httpclient.py b/tornado/httpclient.py index 91dc2db8b..676758942 100644 --- a/tornado/httpclient.py +++ b/tornado/httpclient.py @@ -241,7 +241,6 @@ class HTTPRequest(object): _DEFAULTS = dict( connect_timeout=20.0, request_timeout=20.0, - async_timeout=20.0, follow_redirects=True, max_redirects=5, use_gzip=True, @@ -252,7 +251,6 @@ class HTTPRequest(object): def __init__(self, url, method="GET", headers=None, body=None, auth_username=None, auth_password=None, auth_mode=None, connect_timeout=None, request_timeout=None, - async_timeout=None, if_modified_since=None, follow_redirects=None, max_redirects=None, user_agent=None, use_gzip=None, network_interface=None, streaming_callback=None, @@ -342,7 +340,6 @@ class HTTPRequest(object): self.auth_mode = auth_mode self.connect_timeout = connect_timeout self.request_timeout = request_timeout - self.async_timeout = async_timeout self.follow_redirects = follow_redirects self.max_redirects = max_redirects self.user_agent = user_agent diff --git a/tornado/simple_httpclient.py b/tornado/simple_httpclient.py index 75cb9ff7b..eb241122e 100644 --- a/tornado/simple_httpclient.py +++ b/tornado/simple_httpclient.py @@ -94,7 +94,7 @@ class SimpleAsyncHTTPClient(AsyncHTTPClient): self.queue.append((key, request, callback)) if not len(self.active) < self.max_clients: timeout_handle = self.io_loop.add_timeout( - request.start_time + request.async_timeout, + request.start_time + min(request.connect_timeout, request.request_timeout), functools.partial(self._on_timeout, key)) self.waiting[key] = (request, callback, timeout_handle) self._process_queue() diff --git a/tornado/test/simple_httpclient_test.py b/tornado/test/simple_httpclient_test.py index fc681898c..07def1b89 100644 --- a/tornado/test/simple_httpclient_test.py +++ b/tornado/test/simple_httpclient_test.py @@ -405,7 +405,7 @@ class HeavyloadAsyncHTTPClientTestCase(SimpleHTTPClientTestMixin, AsyncHTTPTestC def test_heavyload_timeout(self): with closing(self.create_client(max_clients=1)) as client: client.fetch(self.get_url('/trigger?wake=false'), self.stop, request_timeout=10) - client.fetch(self.get_url('/hello'), self.stop, async_timeout=3) + client.fetch(self.get_url('/hello'), self.stop, connect_timeout=3) response = self.wait() self.assertEqual(response.code, 599) -- 2.47.2