Fixed None timeout support #1720

CHANGES.rst

@@ -1,7 +1,13 @@
 CHANGES
 =======
 
-1.3.4 (2017-03-14)
+1.3.5 (2017-03-16)
+------------------
+
+- Fixed None timeout support #1720
+
+
+1.3.4 (2017-03-15)
 ------------------
 
 - Revert timeout handling in client request

aiohttp/client.py

@@ -275,10 +275,12 @@ def _request(self, method, url, *,
 
                 break
 
-        if resp.connection is not None:
-            resp.connection.add_callback(handle.cancel)
-        else:
-            handle.cancel()
+        if handle is not None:
+            if resp.connection is not None:
+                resp.connection.add_callback(handle.cancel)
+            else:
+                handle.cancel()
+
         resp._history = tuple(history)
         return resp
 

tests/test_client_functional.py

@@ -629,6 +629,22 @@ def handler(request):
         yield from resp.read()
 
 
+@asyncio.coroutine
+def test_timeout_none(loop, test_client, mocker):
+    @asyncio.coroutine
+    def handler(request):
+        resp = web.StreamResponse()
+        yield from resp.prepare(request)
+        return resp
+
+    app = web.Application(loop=loop)
+    app.router.add_route('GET', '/', handler)
+    client = yield from test_client(app)
+
+    resp = yield from client.get('/', timeout=None)
+    assert resp.status == 200
+
+
 @asyncio.coroutine
 def test_readline_error_on_conn_close(loop, test_client):