X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=safexmlrpc.py;h=71bf4d62d478d17516d177f3952328cb785c4abd;hb=refs%2Fheads%2Fpython3;hp=4f8b63975d37dd3559361ac1b5ced44d6a6bc71a;hpb=3224c1906c82596a86ae734181488ed14a0f0976;p=nodemanager.git diff --git a/safexmlrpc.py b/safexmlrpc.py index 4f8b639..71bf4d6 100644 --- a/safexmlrpc.py +++ b/safexmlrpc.py @@ -1,14 +1,11 @@ -# $Id$ -# $URL$ - """Leverage curl to make XMLRPC requests that check the server's credentials.""" -import xmlrpclib +import xmlrpc.client import curlwrapper -class CertificateCheckingSafeTransport (xmlrpclib.Transport): +class CertificateCheckingSafeTransport (xmlrpc.client.Transport): def __init__(self, cacert, timeout): self.cacert = cacert @@ -22,11 +19,11 @@ class CertificateCheckingSafeTransport (xmlrpclib.Transport): cacert = self.cacert, postdata = request_body, timeout = self.timeout) - return xmlrpclib.loads(contents)[0] + return xmlrpc.client.loads(contents)[0] -class ServerProxy(xmlrpclib.ServerProxy): +class ServerProxy(xmlrpc.client.ServerProxy): def __init__(self, uri, cacert, timeout = 300, **kwds): - xmlrpclib.ServerProxy.__init__(self, uri, + xmlrpc.client.ServerProxy.__init__(self, uri, CertificateCheckingSafeTransport(cacert, timeout), **kwds)