X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fclient%2Fmanifolduploader.py;h=a9dd29d791481ab5a870a7b1352df2074ffcc100;hb=06768bd605e5d47fadfc90a35c74e30f267226a5;hp=8354e1efa160e20aa8b1875255ad072bc3c09c73;hpb=82d0355774b73966cbe0c838c611808dfd2f1c7a;p=sfa.git diff --git a/sfa/client/manifolduploader.py b/sfa/client/manifolduploader.py index 8354e1ef..a9dd29d7 100755 --- a/sfa/client/manifolduploader.py +++ b/sfa/client/manifolduploader.py @@ -27,11 +27,13 @@ DEFAULT_PLATFORM = 'ple' # starting with 2.7.9 we need to turn off server verification import ssl -ssl_needs_unverified_context = hasattr(ssl, '_create_unverified_context') +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""" @@ -78,15 +80,13 @@ 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) - if not ssl_needs_unverified_context: - proxy = xmlrpclib.ServerProxy(url, allow_none = True) - else: - proxy = xmlrpclib.ServerProxy(url, allow_none = True, - context=ssl._create_unverified_context()) + proxy = xmlrpc_client.ServerProxy(url, allow_none = True, + **turn_off_server_verify) + return proxy # does the job for one credential @@ -114,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} @@ -130,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():