Bug fix for HTTPSCertAuthHandler

stamparm · stamparm · commit 62772125e365 · 2013-02-05T12:16:06.000+01:00
diff --git a/lib/request/certhandler.py b/lib/request/certhandler.py
@@ -7,7 +7,6 @@
 
 import httplib
 import urllib2
-import sys
 
 from lib.core.data import conf
 
@@ -20,9 +19,5 @@ def __init__(self, key_file, cert_file):
     def https_open(self, req):
         return self.do_open(self.getConnection, req)
 
-    def getConnection(self, host):
-        if sys.version_info >= (2, 6):
-            retVal = httplib.HTTPSConnection(host, key_file=self.key_file, cert_file=self.cert_file, timeout=conf.timeout)
-        else:
-            retVal = httplib.HTTPSConnection(host, key_file=self.key_file, cert_file=self.cert_file)
-        return retVal
+    def getConnection(self, host, timeout=None):
+        return httplib.HTTPSConnection(host, key_file=self.key_file, cert_file=self.cert_file, timeout=conf.timeout)
