new urllib3 version

#498

diff --git a/Makefile b/Makefile
index 0ae2182eb19880acda28f4ee8b0ab4cf4b671025..25d023695de76b3f46e7153c09eec0db1dac1c49 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ pyc:
 deps:
        rm -fr requests/packages/urllib3
        git clone https://github.com/shazow/urllib3.git
-       cd urllib3 && git checkout release && cd ..
+       cd urllib3 && git checkout master && cd ..
        mv urllib3/urllib3 requests/packages/
        rm -fr urllib3
 

diff --git a/requests/packages/urllib3/__init__.py b/requests/packages/urllib3/__init__.py
index 2d6fecec4f024933fd026d852f45ccaa420b3f0a..81e76f50bae01ee037274bafd44bdcadf514e20a 100644 (file)
--- a/requests/packages/urllib3/__init__.py
+++ b/requests/packages/urllib3/__init__.py
@@ -10,7 +10,7 @@ urllib3 - Thread-safe connection pooling and re-using.
 
 __author__ = 'Andrey Petrov (andrey.petrov@shazow.net)'
 __license__ = 'MIT'
-__version__ = '1.3'
+__version__ = 'dev'
 
 
 from .connectionpool import (

diff --git a/requests/packages/urllib3/connectionpool.py b/requests/packages/urllib3/connectionpool.py
index c3cb3b125f31f7bd4d03288816f5d9aff28bb8e9..336aa7737edaeae1dd3073f72b5a044994b8de1a 100644 (file)
--- a/requests/packages/urllib3/connectionpool.py
+++ b/requests/packages/urllib3/connectionpool.py
@@ -260,10 +260,11 @@ class HTTPConnectionPool(ConnectionPool, RequestMethods):
 
         httplib_response = conn.getresponse()
 
-        log.debug("\"%s %s %s\" %s %s" %
-                  (method, url,
-                   conn._http_vsn_str, # pylint: disable-msg=W0212
-                   httplib_response.status, httplib_response.length))
+        # AppEngine doesn't have a version attr.
+        http_version = getattr(conn, '_http_vsn_str', 'HTTP/?'),
+        log.debug("\"%s %s %s\" %s %s" % (method, url, http_version,
+                                          httplib_response.status,
+                                          httplib_response.length))
 
         return httplib_response