Merge pull request #67 from philiptzou/pull-request-https-timeout

TimeoutHTTPSConnection fixes

Author: mnaberez

superlance/timeoutconn.py

@@ -1,5 +1,7 @@
 from superlance.compat import httplib
 import socket
+import ssl
+
 
 class TimeoutHTTPConnection(httplib.HTTPConnection):
     """A customised HTTPConnection allowing a per-connection
@@ -12,7 +14,7 @@ def connect(self):
 
         e = "getaddrinfo returns an empty list"
         for res in socket.getaddrinfo(self.host, self.port,
-                0, socket.SOCK_STREAM):
+                                      0, socket.SOCK_STREAM):
             af, socktype, proto, canonname, sa = res
             try:
                 self.sock = socket.socket(af, socktype, proto)
@@ -28,6 +30,7 @@ def connect(self):
         if not self.sock:
             raise socket.error(e)
 
+
 class TimeoutHTTPSConnection(httplib.HTTPSConnection):
     timeout = None
 
@@ -36,7 +39,6 @@ def connect(self):
 
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         if self.timeout:
-            self.sock.settimeout(self.timeout)
+            sock.settimeout(self.timeout)
         sock.connect((self.host, self.port))
-        ssl = socket.ssl(sock, self.key_file, self.cert_file)
-        self.sock = httplib.FakeSocket(sock, ssl)
+        self.sock = ssl.wrap_socket(sock, self.key_file, self.cert_file)