this was intended to be part of previous commit..

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

diff --git a/sfa/util/xmlrpcprotocol.py b/sfa/util/xmlrpcprotocol.py
index d1fbe1e..2d2586e 100644 (file)
--- a/sfa/util/xmlrpcprotocol.py
+++ b/sfa/util/xmlrpcprotocol.py
@@ -1,8 +1,9 @@
 # XMLRPC-specific code for SFA Client
 
+import httplib
 import xmlrpclib
 
-from sfa.util.sfalogging import sfa_logger, console_logger
+from sfa.util.sfalogging import sfa_logger
 
 ##
 # ServerException, ExceptionUnmarshaller
@@ -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()
+#            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 HTTPS"
-                )
-        else:
-            return httplib.HTTPS(host, None, key_file=self.key_file, cert_file=self.cert_file) #**(x509 or {}))
+            raise NotImplementedError("your version of httplib doesn't support HTTPSConnection")
 
     def getparser(self):
         unmarshaller = ExceptionUnmarshaller()
@@ -49,18 +46,14 @@ class XMLRPCTransport(xmlrpclib.Transport):
 
 class XMLRPCServerProxy(xmlrpclib.ServerProxy):
     def __init__(self, url, transport, allow_none=True, options=None):
-        self.options = options
         verbose = False
-        if self.options and self.options.debug:
+        if options and options.debug:
             verbose = True
-        if self.options and hasattr(self.options,'client'):
-            XMLRPCServerProxy.logger=console_logger
-        else:
-            XMLRPCServerProxy.logger=sfa_logger
+        sfa_logger().info ("Connecting to xmlrpcserver at %s (with verbose=%s)"%(url,verbose))
         xmlrpclib.ServerProxy.__init__(self, url, transport, allow_none=allow_none, verbose=verbose)
 
     def __getattr__(self, attr):
-        XMLRPCServerProxy.logger.debug("Calling xml-rpc method:%s"%attr)
+        sfa_logger().info ("Calling xml-rpc method:%s"%attr)
         return xmlrpclib.ServerProxy.__getattr__(self, attr)