diff options
author | Christopher Baines <mail@cbaines.net> | 2015-12-22 13:47:07 +0000 |
---|---|---|
committer | Christopher Baines <mail@cbaines.net> | 2015-12-22 13:48:06 +0000 |
commit | 79f51e45f74dd32f9c1a103150ded9d575f5f94c (patch) | |
tree | adcea8da78181c97b46d4483657877b2b348833a /requests/packages/urllib3/_collections.py | |
parent | 59759b30c8a8f23377afe562a44ddc893dbbb833 (diff) | |
parent | 08c16e06ad11c6fcb26f4ca1ea3f11093598092f (diff) | |
download | python-requests-79f51e45f74dd32f9c1a103150ded9d575f5f94c.tar python-requests-79f51e45f74dd32f9c1a103150ded9d575f5f94c.tar.gz |
change version to 2.9.1-1 (UNRELEASED)
New upstream release 2.9.1
Diffstat (limited to 'requests/packages/urllib3/_collections.py')
-rw-r--r-- | requests/packages/urllib3/_collections.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/requests/packages/urllib3/_collections.py b/requests/packages/urllib3/_collections.py index b68b9a5..67f3ce9 100644 --- a/requests/packages/urllib3/_collections.py +++ b/requests/packages/urllib3/_collections.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import from collections import Mapping, MutableMapping try: from threading import RLock @@ -167,7 +168,7 @@ class HTTPHeaderDict(MutableMapping): def __ne__(self, other): return not self.__eq__(other) - if not PY3: # Python 2 + if not PY3: # Python 2 iterkeys = MutableMapping.iterkeys itervalues = MutableMapping.itervalues @@ -234,7 +235,7 @@ class HTTPHeaderDict(MutableMapping): """ if len(args) > 1: raise TypeError("extend() takes at most 1 positional " - "arguments ({} given)".format(len(args))) + "arguments ({0} given)".format(len(args))) other = args[0] if len(args) >= 1 else () if isinstance(other, HTTPHeaderDict): @@ -304,7 +305,7 @@ class HTTPHeaderDict(MutableMapping): return list(self.iteritems()) @classmethod - def from_httplib(cls, message): # Python 2 + def from_httplib(cls, message): # Python 2 """Read headers from a Python 2 httplib message object.""" # python2.7 does not expose a proper API for exporting multiheaders # efficiently. This function re-reads raw lines from the message |