From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 30 Dec 2010 20:47:08 +0000 (+0100)
Subject: this was intended to be part of previous commit..
X-Git-Tag: sfa-1.0-12~23
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=53c787c0df2ea13c9252ede5a02449dcd7f60604;hp=0ad93d24cd833248eb1eb4eb37ad3b95a5d23f58;p=sfa.git

this was intended to be part of previous commit..
---

diff --git a/sfa/util/xmlrpcprotocol.py b/sfa/util/xmlrpcprotocol.py
index d06d1304..2d2586e8 100644
--- a/sfa/util/xmlrpcprotocol.py
+++ b/sfa/util/xmlrpcprotocol.py
@@ -1,5 +1,6 @@
 # XMLRPC-specific code for SFA Client
 
+import httplib
 import xmlrpclib
 
 from sfa.util.sfalogging import sfa_logger
@@ -31,16 +32,12 @@ class XMLRPCTransport(xmlrpclib.Transport):
     def make_connection(self, host):
         # create a HTTPS connection object from a host descriptor
         # host may be a string, or a (host, x509-dict) tuple
-        import httplib
         host, extra_headers, x509 = self.get_host_info(host)
         try:
-#            HTTPS = httplib.HTTPS()
-            HTTPS = httplib.HTTPSConnection(host, None)
-        except AttributeError:
-            raise NotImplementedError("your version of httplib doesn't support HTTPSConnection")
-        else:
 #            return httplib.HTTPS(host, None, key_file=self.key_file, cert_file=self.cert_file) #**(x509 or {}))
             return httplib.HTTPSConnection(host, None, key_file=self.key_file, cert_file=self.cert_file) #**(x509 or {}))
+        except AttributeError:
+            raise NotImplementedError("your version of httplib doesn't support HTTPSConnection")
 
     def getparser(self):
         unmarshaller = ExceptionUnmarshaller()