Merge pull request #2 from riptano/2461-peername-ipv6

Account for IPV6 in hostname stuff

Author: nickmbailey

Lib/ssl.py

@@ -1015,10 +1015,8 @@ def _createSSLEngine(self, addr, hostname=None, cert_file=None, key_file=None):
                 self._key_managers.getKeyManagers(),
                 trust_managers, None)
 
-        if hostname is not None:
-            engine = context.createSSLEngine(hostname, addr[1])
-        else:
-            engine = context.createSSLEngine(*addr)
+        # addr could be ipv6, only extract relevant parts
+        engine = context.createSSLEngine((hostname or addr[0]), addr[1])
 
         # apparently this can be used to enforce hostname verification
         if hostname is not None and self._check_hostname: