git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
66874ba
..
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 = {}
try: turn_off_server_verify = { 'context' : ssl._create_unverified_context() }
except: turn_off_server_verify = {}
-import xmlrpclib
import getpass
import getpass
+from sfa.util.py23 import xmlrpc_client
+
class ManifoldUploader:
"""A utility class for uploading delegated credentials to a manifold/MySlice infrastructure"""
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)
# if not self._proxy:
# url=self.url()
# self.logger.info("Connecting manifold url %s"%url)
-# self._proxy = xmlrpc
lib
.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)
# return self._proxy
url=self.url()
self.logger.debug("Connecting manifold url %s"%url)
- proxy = xmlrpc
lib
.ServerProxy(url, allow_none = True,
- **turn_off_server_verify)
+ proxy = xmlrpc
_client
.ServerProxy(url, allow_none = True,
+
**turn_off_server_verify)
return proxy
return proxy