diff options
| author | SVN-Git Migration <python-modules-team@lists.alioth.debian.org> | 2015-10-08 13:41:22 -0700 |
|---|---|---|
| committer | SVN-Git Migration <python-modules-team@lists.alioth.debian.org> | 2015-10-08 13:41:22 -0700 |
| commit | 3a4ef8165fb2951781a7bcc4189e90faf26caf2d (patch) | |
| tree | 5223d80835a57dad6b7b6e0c37f689441ccb4e1e /requests/packages/urllib3 | |
| parent | 40337989ba5056432c9f2af3c42267e5ee9e3e18 (diff) | |
| download | python-requests-3a4ef8165fb2951781a7bcc4189e90faf26caf2d.tar python-requests-3a4ef8165fb2951781a7bcc4189e90faf26caf2d.tar.gz | |
Imported Upstream version 0.11.2
Diffstat (limited to 'requests/packages/urllib3')
| -rw-r--r-- | requests/packages/urllib3/__init__.py | 2 | ||||
| -rw-r--r-- | requests/packages/urllib3/connectionpool.py | 9 |
2 files changed, 6 insertions, 5 deletions
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 |