deeper pass on xmlrpclib vs xmlrpc.client as well as configparser

[sfa.git] / sfa / client / manifolduploader.py

diff --git a/sfa/client/manifolduploader.py b/sfa/client/manifolduploader.py
index c291a42..a9dd29d 100755 (executable)
--- a/sfa/client/manifolduploader.py
+++ b/sfa/client/manifolduploader.py
@@ -30,9 +30,10 @@ import ssl
 try:    turn_off_server_verify = { 'context' : ssl._create_unverified_context() } 
 except: turn_off_server_verify = {}
 
-import xmlrpclib
 import getpass
 
+from sfa.util.py23 import xmlrpc_client
+
 class ManifoldUploader:
     """A utility class for uploading delegated credentials to a manifold/MySlice infrastructure"""
 
@@ -79,12 +80,12 @@ class ManifoldUploader:
 #        if not self._proxy:
 #            url=self.url()
 #            self.logger.info("Connecting manifold url %s"%url)
-#            self._proxy = xmlrpclib.ServerProxy(url, allow_none = True)
+#            self._proxy = xmlrpc_client.ServerProxy(url, allow_none = True)
 #        return self._proxy
         url=self.url()
         self.logger.debug("Connecting manifold url %s"%url)
-        proxy = xmlrpclib.ServerProxy(url, allow_none = True,
-                                      **turn_off_server_verify)
+        proxy = xmlrpc_client.ServerProxy(url, allow_none = True,
+                                          **turn_off_server_verify)
 
         return proxy
 
@@ -113,7 +114,7 @@ class ManifoldUploader:
             try:
                 self.logger.debug("Using new v2 method forward+annotation@%s %s"%(platform,message))
                 retcod2=manifold.forward (query, annotation)
-            except Exception,e:
+            except Exception as e:
                 # xxx we need a constant constant for UNKNOWN, how about using 1
                 MANIFOLD_UNKNOWN=1
                 retcod2={'code':MANIFOLD_UNKNOWN,'description':"%s"%e}
@@ -129,7 +130,7 @@ class ManifoldUploader:
             self.logger.debug("****** full retcod2")
             for (k,v) in retcod2.items(): self.logger.debug("**** %s: %s"%(k,v))
             return False
-        except Exception, e:
+        except Exception as e:
             if message: self.logger.error("Could not upload %s %s"%(message,e))
             else:        self.logger.error("Could not upload credential %s"%e)
             if self.logger.debugEnabled():