- p = Popen((CURL, '--cacert', '/usr/boot/cacert.pem', '--data', '@-', 'https://%s%s' % (host, handler)), stdin=PIPE, stdout=PIPE, stderr=PIPE)
- p.stdin.write(request_body)
- p.stdin.close()
- contents = p.stdout.read()
- p.stdout.close()
- error = p.stderr.read()
- p.stderr.close()
- rc = p.wait()
- if rc != 0: raise xmlrpclib.ProtocolError(host + handler, rc, error, '')
- return xmlrpclib.loads(contents)[0]
-
-class ServerProxy(xmlrpclib.ServerProxy):
- def __init__(self, handler, *args, **kw_args): xmlrpclib.ServerProxy.__init__(self, handler, CertificateCheckingSafeTransport())
+ url='https://%s%s' % (host, handler)
+ # this might raise an xmlrpclib.Protocolerror exception
+ contents = curlwrapper.retrieve(url,
+ cacert = self.cacert,
+ postdata = request_body,
+ timeout = self.timeout)
+ return xmlrpc.client.loads(contents)[0]
+
+class ServerProxy(xmlrpc.client.ServerProxy):
+
+ def __init__(self, uri, cacert, timeout = 300, **kwds):
+ xmlrpc.client.ServerProxy.__init__(self, uri,
+ CertificateCheckingSafeTransport(cacert, timeout),
+ **kwds)