Merge pull request #1935 from cjstapleton/master

Add timeout to stream with testing

2 files changed, 9 insertions, 4 deletions

diff --git a/requests/adapters.py b/requests/adapters.py
index ca462232..28bea07c 100644
--- a/requests/adapters.py
+++ b/requests/adapters.py
@@ -310,10 +310,7 @@ class HTTPAdapter(BaseAdapter):
 
         chunked = not (request.body is None or 'Content-Length' in request.headers)
 
-        if stream:
-            timeout = TimeoutSauce(connect=timeout)
-        else:
-            timeout = TimeoutSauce(connect=timeout, read=timeout)
+        timeout = TimeoutSauce(connect=timeout, read=timeout)
 
         try:
             if not chunked:
diff --git a/test_requests.py b/test_requests.py
index 998f17f3..17de8491 100755
--- a/test_requests.py
+++ b/test_requests.py
@@ -1179,5 +1179,13 @@ class TestMorselToCookieMaxAge(unittest.TestCase):
             morsel_to_cookie(morsel)
 
 
+class TestTimeout:
+    def test_stream_timeout(self):
+        try:
+            r = requests.get('https://httpbin.org/delay/10', timeout=5.0)
+        except requests.exceptions.Timeout as e:
+            assert 'Read timed out' in e.args[0].args[0]
+
+
 if __name__ == '__main__':
     unittest.main()