From 2bae0d295ba4d28392caf1aa4b8f95d54692db34 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Sat, 31 Mar 2012 17:39:26 -0400 Subject: [PATCH] new urllib3 version #498 --- Makefile | 2 +- requests/packages/urllib3/__init__.py | 2 +- requests/packages/urllib3/connectionpool.py | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 0ae2182..25d0236 100644 --- 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 2d6fece..81e76f5 100644 --- 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 c3cb3b1..336aa77 100644 --- 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 -- 2.7.4