Merge branch 'master' into exp2

[sfa.git] / sfa / util / httpsProtocol.py

diff --git a/sfa/util/httpsProtocol.py b/sfa/util/httpsProtocol.py
index 0766acf..e6c6be1 100644 (file)
--- a/sfa/util/httpsProtocol.py
+++ b/sfa/util/httpsProtocol.py
@@ -4,7 +4,8 @@ import sys
 
 
 def is_python26():
-    return sys.version_info[0] == 2 and sys.version_info[1] == 6
+    return False
+    #return sys.version_info[0] == 2 and sys.version_info[1] == 6
 
 # wrapper around standartd https modules. Properly supports timeouts.  
 
@@ -12,7 +13,9 @@ class HTTPSConnection(httplib.HTTPSConnection):
     def __init__(self, host, port=None, key_file=None, cert_file=None,
                  strict=None, timeout = None):
         httplib.HTTPSConnection.__init__(self, host, port, key_file, cert_file, strict)
-        self.timeout = float(timeout)
+        if timeout:
+            timeout = float(timeout)
+        self.timeout = timeout
 
     def connect(self):
         """Connect to a host on a given (SSL) port."""