prototype for new urllib3 timeouts

diff --git a/requests/adapters.py b/requests/adapters.py
index 750afec..b9a12b0 100644 (file)
--- a/requests/adapters.py
+++ b/requests/adapters.py
@@ -13,6 +13,7 @@ import socket
 from .models import Response
 from .packages.urllib3.poolmanager import PoolManager, proxy_from_url
 from .packages.urllib3.response import HTTPResponse
+from .packages.urllib3.util import Timeout
 from .compat import urlparse, basestring, urldefrag, unquote
 from .utils import (DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers,
                     except_on_missing_scheme, get_auth_from_url)
@@ -298,6 +299,11 @@ class HTTPAdapter(BaseAdapter):
 
         chunked = not (request.body is None or 'Content-Length' in request.headers)
 
+        if stream:
+            timeout = Timeout(connect=timeout)
+        else:
+            timeout = Timeout(connect=timeout, read=timeout)
+
         try:
             if not chunked:
                 resp = conn.urlopen(