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
remove py23 compat layer
[sfa.git]
/
sfa
/
client
/
manifolduploader.py
diff --git
a/sfa/client/manifolduploader.py
b/sfa/client/manifolduploader.py
index
c469b35
..
8d1d74e
100755
(executable)
--- a/
sfa/client/manifolduploader.py
+++ b/
sfa/client/manifolduploader.py
@@
-34,7
+34,7
@@
except:
import getpass
import getpass
-
from sfa.util.py23 import xmlrpc_
client
+
import xmlrpc.
client
class ManifoldUploader:
class ManifoldUploader:
@@
-91,11
+91,11
@@
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
_
client.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
_
client.ServerProxy(url, allow_none=True,
+ proxy = xmlrpc
.
client.ServerProxy(url, allow_none=True,
**turn_off_server_verify)
return proxy
**turn_off_server_verify)
return proxy