From: Kenneth Reitz <me@kennethreitz.com>
Date: Tue, 24 Sep 2013 18:31:00 +0000 (-0400)
Subject: TimeoutSauce!
X-Git-Tag: v2.0~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c93419f5125b2e836507eb243531985383faa8b6;p=services%2Fpython-requests.git

TimeoutSauce!
---

diff --git a/requests/adapters.py b/requests/adapters.py
index c03a015..d557b74 100644
--- a/requests/adapters.py
+++ b/requests/adapters.py
@@ -13,7 +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 .packages.urllib3.util import Timeout as TimeoutSauce
 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)
@@ -300,9 +300,9 @@ class HTTPAdapter(BaseAdapter):
         chunked = not (request.body is None or 'Content-Length' in request.headers)
 
         if stream:
-            timeout = Timeout(connect=timeout)
+            timeout = TimeoutSauce(connect=timeout)
         else:
-            timeout = Timeout(connect=timeout, read=timeout)
+            timeout = TimeoutSauce(connect=timeout, read=timeout)
 
         try:
             if not chunked: