X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fclient%2Fsfaserverproxy.py;h=e281f66d436615c1c8ed2689282560770cbd62ef;hb=f857533f5e3535599eb4b74b8ac214e50370a542;hp=333984c67779a90f1e0b7aedca3a1e6293d2f54f;hpb=06768bd605e5d47fadfc90a35c74e30f267226a5;p=sfa.git

diff --git a/sfa/client/sfaserverproxy.py b/sfa/client/sfaserverproxy.py
index 333984c6..e281f66d 100644
--- a/sfa/client/sfaserverproxy.py
+++ b/sfa/client/sfaserverproxy.py
@@ -5,9 +5,8 @@ import ssl
 try:    turn_off_server_verify = { 'context' : ssl._create_unverified_context() } 
 except: turn_off_server_verify = {}
 
-from httplib import HTTPS, HTTPSConnection
-
 from sfa.util.py23 import xmlrpc_client
+from sfa.util.py23 import http_client
 
 try:
     from sfa.util.sfalogging import logger
@@ -50,9 +49,9 @@ class XMLRPCTransport(xmlrpc_client.Transport):
         # create a HTTPS connection object from a host descriptor
         # host may be a string, or a (host, x509-dict) tuple
         host, extra_headers, x509 = self.get_host_info(host)
-        conn = HTTPSConnection(host, None, key_file = self.key_file,
-                               cert_file = self.cert_file,
-                               **turn_off_server_verify)
+        conn = http_client.HTTPSConnection(host, None, key_file = self.key_file,
+                                           cert_file = self.cert_file,
+                                           **turn_off_server_verify)
 
         # Some logic to deal with timeouts. It appears that some (or all) versions
         # of python don't set the timeout after the socket is created. We'll do it
@@ -85,10 +84,10 @@ class XMLRPCServerProxy(xmlrpc_client.ServerProxy):
         self.url = url
         xmlrpc_client.ServerProxy.__init__(self, url, transport, allow_none=allow_none,
                                            verbose=verbose,
-                                       **turn_off_server_verify)
+                                           **turn_off_server_verify)
 
     def __getattr__(self, attr):
-        logger.debug ("xml-rpc %s method:%s" % (self.url, attr))
+        logger.debug("xml-rpc %s method:%s" % (self.url, attr))
         return xmlrpc_client.ServerProxy.__getattr__(self, attr)
 
 ########## the object on which we can send methods that get sent over xmlrpc