X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fclient%2Fmanifolduploader.py;h=a9dd29d791481ab5a870a7b1352df2074ffcc100;hb=06768bd605e5d47fadfc90a35c74e30f267226a5;hp=66874baee629e544c5890b32008d6c215a6f4eca;hpb=a0ef6e7c91c3c8fa376943d28fec8c5c204a78cd;p=sfa.git diff --git a/sfa/client/manifolduploader.py b/sfa/client/manifolduploader.py index 66874bae..a9dd29d7 100755 --- 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