Merge pull request urllib3#721 from jayvdb/py3-unindexed-parameters

shazow · shazow · commit e1581b6df88f · 2015-10-18T16:59:50.000-07:00
Python 2.6 does not support unindexed parameters
diff --git a/urllib3/_collections.py b/urllib3/_collections.py
@@ -234,7 +234,7 @@ def extend(self, *args, **kwargs):
         """
         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):
diff --git a/urllib3/util/response.py b/urllib3/util/response.py
@@ -44,7 +44,7 @@ def assert_header_parsing(headers):
     # This will fail silently if we pass in the wrong kind of parameter.
     # To make debugging easier add an explicit check.
     if not isinstance(headers, httplib.HTTPMessage):
-        raise TypeError('expected httplib.Message, got {}.'.format(
+        raise TypeError('expected httplib.Message, got {0}.'.format(
             type(headers)))
 
     defects = getattr(headers, 'defects', None)
