From: Kenneth Reitz <me@kennethreitz.com>
Date: Sun, 25 Sep 2011 21:42:27 +0000 (-0400)
Subject: urllib3 update
X-Git-Tag: v0.8.0~94^2~69
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=55cea74b5643e660cc5cee9a4b0abe4cfb3a2f27;p=services%2Fpython-requests.git

urllib3 update
---

diff --git a/requests/packages/urllib3/connectionpool.py b/requests/packages/urllib3/connectionpool.py
index 5756411..2077026 100644
--- a/requests/packages/urllib3/connectionpool.py
+++ b/requests/packages/urllib3/connectionpool.py
@@ -203,7 +203,7 @@ class HTTPConnectionPool(ConnectionPool):
 
     def urlopen(self, method, url, body=None, headers=None, retries=3,
                 redirect=True, assert_same_host=True, pool_timeout=None,
-                **response_kw):
+                release_conn=None, **response_kw):
         """
         Get a connection from the pool and perform an HTTP request.
 
@@ -238,6 +238,14 @@ class HTTPConnectionPool(ConnectionPool):
             block for ``pool_timeout`` seconds and raise EmptyPoolError if no
             connection is available within the time period.
 
+        release_conn
+            If False, then the urlopen call will not release the connection
+            back into the pool once a response is received. This is useful if
+            you're not preloading the response's content immediately. You will
+            need to call ``r.release_conn()`` on the response ``r`` to return
+            the connection back into the pool. If None, it takes the value of
+            ``response_kw.get('preload_content', True)``.
+
         Additional parameters are passed to
         ``HTTPResponse.from_httplib(r, **response_kw)``
         """
@@ -247,6 +255,9 @@ class HTTPConnectionPool(ConnectionPool):
         if retries < 0:
             raise MaxRetryError("Max retries exceeded for url: %s" % url)
 
+        if release_conn is None:
+            release_conn = response_kw.get('preload_content', True)
+
         # Check host
         if assert_same_host and not self.is_same_host(url):
             host = "%s://%s" % (self.scheme, self.host)
@@ -256,14 +267,13 @@ class HTTPConnectionPool(ConnectionPool):
             raise HostChangedError("Connection pool with host '%s' tried to "
                                    "open a foreign host: %s" % (host, url))
 
-        try:
-            # Request a connection from the queue
-            conn = self._get_conn(timeout=pool_timeout)
+        # Request a connection from the queue
+        conn = self._get_conn(timeout=pool_timeout)
 
+        try:
             # Make the request on the httplib connection object
             httplib_response = self._make_request(conn, method, url,
                                                   body=body, headers=headers)
-
             # Import httplib's response into our own wrapper object
             response = HTTPResponse.from_httplib(httplib_response,
                                                  pool=self,
@@ -283,6 +293,15 @@ class HTTPConnectionPool(ConnectionPool):
             raise SSLError(e)
 
         except (HTTPException, SocketError), e:
+            # Connection broken, discard. It will be replaced next _get_conn().
+            conn = None
+
+        finally:
+            if release_conn:
+                # Put the connection back to be reused
+                self._put_conn(conn)
+
+        if not conn:
             log.warn("Retrying (%d attempts remain) after connection "
                      "broken by '%r': %s" % (retries, e, url))
             return self.urlopen(method, url, body, headers, retries - 1,
diff --git a/requests/packages/urllib3/response.py b/requests/packages/urllib3/response.py
index 3cba3ad..14b3068 100644
--- a/requests/packages/urllib3/response.py
+++ b/requests/packages/urllib3/response.py
@@ -56,7 +56,7 @@ class HTTPResponse(object):
     }
 
     def __init__(self, body='', headers=None, status=0, version=0, reason=None,
-                 strict=0, preload_content=False, decode_content=True,
+                 strict=0, preload_content=True, decode_content=True,
                  original_response=None, pool=None, connection=None):
         self.headers = headers or {}
         self.status = status