From: smbaker <smbaker@fc8clean.lan>
Date: Wed, 10 Aug 2011 00:25:15 +0000 (-0700)
Subject: remove timeout arguments; reverting back to previous version
X-Git-Tag: sfa-1.0-30~1
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=259a3130fb47ff5d0c47a96b48cefc02a12cb204

remove timeout arguments; reverting back to previous version
---

diff --git a/sfa/util/xmlrpcprotocol.py b/sfa/util/xmlrpcprotocol.py
index 0c07accd..1cdc6058 100644
--- a/sfa/util/xmlrpcprotocol.py
+++ b/sfa/util/xmlrpcprotocol.py
@@ -49,11 +49,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)