Remove `async_timeout` and use `connect_timeout` instead

diff --git a/tornado/httpclient.py b/tornado/httpclient.py
index 91dc2db8b5373b6ca485d396003284fa7aad7ce3..676758942e53be1ebcfc28d553d4fe1eedee86ec 100644 (file)
--- 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 75cb9ff7b849c085ee8a609c6420f0fd2ab0939b..eb241122eac68b012505e449df76163693f44f91 100644 (file)
--- 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 fc681898c25dba1ac42d38f940750e9a5c3f9212..07def1b89994d9bc8afb1e12d614d686da7d730f 100644 (file)
--- 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)