Update urllib3 to v1.21.1

HISTORY.rst

@@ -39,6 +39,10 @@ Release History
 - The dismayed person emoticon (``/o\\``) no longer has a big head. I'm sure
   this is what you were all worrying about most.
 
+**Miscellaneous**
+
+- Updated bundled urllib3 to v1.21.1.
+
 2.13.0 (2017-01-24)
 +++++++++++++++++++
 

requests/packages/urllib3/__init__.py

@@ -32,7 +32,7 @@ def emit(self, record):
 
 __author__ = 'Andrey Petrov ([email protected])'
 __license__ = 'MIT'
-__version__ = '1.20'
+__version__ = '1.21.1'
 
 __all__ = (
     'HTTPConnectionPool',

requests/packages/urllib3/_collections.py

@@ -144,7 +144,7 @@ def __init__(self, headers=None, **kwargs):
             self.extend(kwargs)
 
     def __setitem__(self, key, val):
-        self._container[key.lower()] = (key, val)
+        self._container[key.lower()] = [key, val]
         return self._container[key.lower()]
 
     def __getitem__(self, key):
@@ -215,18 +215,11 @@ def add(self, key, val):
         'bar, baz'
         """
         key_lower = key.lower()
-        new_vals = key, val
+        new_vals = [key, val]
         # Keep the common case aka no item present as fast as possible
         vals = self._container.setdefault(key_lower, new_vals)
         if new_vals is not vals:
-            # new_vals was not inserted, as there was a previous one
-            if isinstance(vals, list):
-                # If already several items got inserted, we have a list
-                vals.append(val)
-            else:
-                # vals should be a tuple then, i.e. only one item so far
-                # Need to convert the tuple to list for further extension
-                self._container[key_lower] = [vals[0], vals[1], val]
+            vals.append(val)
 
     def extend(self, *args, **kwargs):
         """Generic import function for any type of header-like object.
@@ -262,10 +255,7 @@ def getlist(self, key):
         except KeyError:
             return []
         else:
-            if isinstance(vals, tuple):
-                return [vals[1]]
-            else:
-                return vals[1:]
+            return vals[1:]
 
     # Backwards compatibility for httplib
     getheaders = getlist

requests/packages/urllib3/connection.py

@@ -329,7 +329,11 @@ def connect(self):
             assert_fingerprint(self.sock.getpeercert(binary_form=True),
                                self.assert_fingerprint)
         elif context.verify_mode != ssl.CERT_NONE \
+                and not getattr(context, 'check_hostname', False) \
                 and self.assert_hostname is not False:
+            # While urllib3 attempts to always turn off hostname matching from
+            # the TLS library, this cannot always be done. So we check whether
+            # the TLS Library still thinks it's matching hostnames.
             cert = self.sock.getpeercert()
             if not cert.get('subjectAltName', ()):
                 warnings.warn((