From 259a3130fb47ff5d0c47a96b48cefc02a12cb204 Mon Sep 17 00:00:00 2001 From: smbaker Date: Tue, 9 Aug 2011 17:25:15 -0700 Subject: [PATCH] remove timeout arguments; reverting back to previous version --- sfa/util/xmlrpcprotocol.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) 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) -- 2.43.0