Fix bug #57

Author: jcgregorio

CHANGELOG

@@ -742,10 +742,10 @@ class HTTPSConnectionWithTimeout(httplib.HTTPSConnection):
 
     def __init__(self, host, port=None, key_file=None, cert_file=None,
                  strict=None, timeout=None, proxy_info=None):
-        self.timeout = timeout
-        self.proxy_info = proxy_info
         httplib.HTTPSConnection.__init__(self, host, port=port, key_file=key_file,
                 cert_file=cert_file, strict=strict)
+        self.timeout = timeout
+        self.proxy_info = proxy_info
 
     def connect(self):
         "Connect to a host on a given (SSL) port."

MANIFEST

@@ -611,6 +611,10 @@ def testIndividualTimeout(self):
         self.assertTrue(content.startswith("Request Timeout"))
 
 
+    def testHTTPSInitTimeout(self):
+        c = httplib2.HTTPSConnectionWithTimeout('localhost', 80, timeout=47)
+        self.assertEqual(47, c.timeout)
+
     def testGetDeflate(self):
         # Test that we support deflate compression
         uri = urlparse.urljoin(base, "deflate/deflated.asis")