Merge branch 'upstreammaster'

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

diff --git a/sfa/util/xmlrpcprotocol.py b/sfa/util/xmlrpcprotocol.py
index 0c07acc..2263b28 100644 (file)
--- a/sfa/util/xmlrpcprotocol.py
+++ b/sfa/util/xmlrpcprotocol.py
@@ -1,9 +1,10 @@
 # XMLRPC-specific code for SFA Client
 
 import xmlrpclib
-#from sfa.util.httpsProtocol import HTTPS, HTTPSConnection
 from httplib import HTTPS, HTTPSConnection
+
 from sfa.util.sfalogging import logger
+
 ##
 # ServerException, ExceptionUnmarshaller
 #
@@ -49,11 +50,8 @@ class XMLRPCTransport(xmlrpclib.Transport):
             #conn = HTTPSConnection(host, None, key_file=self.key_file, cert_file=self.cert_file, timeout=self.timeout) #**(x509 or {}))
             conn = HTTPSConnection(host, None, key_file=self.key_file, cert_file=self.cert_file) #**(x509 or {}))
         else:
-            try:
-                conn = HTTPS(host, None, key_file=self.key_file, cert_file=self.cert_file, timeout=self.timeout) #**(x509 or {}))
-            except TypeError:
-                # some versions don't have a timeout argument
-                conn = HTTPS(host, None, key_file=self.key_file, cert_file=self.cert_file) #**(x509 or {}))
+            #conn = HTTPS(host, None, key_file=self.key_file, cert_file=self.cert_file, timeout=self.timeout) #**(x509 or {}))
+            conn = HTTPS(host, None, key_file=self.key_file, cert_file=self.cert_file) #**(x509 or {}))
 
         if hasattr(conn, 'set_timeout'):
             conn.set_timeout(self.timeout)
@@ -70,7 +68,7 @@ class XMLRPCTransport(xmlrpclib.Transport):
                 real_conn = conn
             conn.connect()
             if hasattr(real_conn, "sock") and hasattr(real_conn.sock, "settimeout"):
-                real_conn.sock.settimeout(self.timeout)
+                real_conn.sock.settimeout(float(self.timeout))
 
         return conn