Fixed use of depreciated env.get() in b_xmlrpc.py module

This commit is contained in:
Jason Gerard DeRose
2008-10-27 23:56:22 -06:00
parent 83d6c95e46
commit 2307d4ddd0

View File

@@ -36,23 +36,26 @@ from ipalib import errors
class xmlrpc(Backend): class xmlrpc(Backend):
""" """
Kerberos backend plugin. XML-RPC client backend plugin.
""" """
def get_client(self, verbose=False): def get_client(self):
# FIXME: The server uri should come from self.api.env.server_uri """
if api.env.get('kerberos'): Return an xmlrpclib.ServerProxy instance (the client).
server = api.env.server.next() """
if verbose: print "Connecting to %s" % server uri = self.api.env.xmlrpc_uri
return xmlrpclib.ServerProxy('https://%s/ipa/xml' % server, transport=KerbTransport(), verbose=verbose) if uri.startswith('https://'):
else: return xmlrpclib.ServerProxy(uri,
return xmlrpclib.ServerProxy('http://localhost:8888', verbose=verbose) transport=KerbTransport(),
verbose=self.api.env.verbose,
)
return xmlrpclib.ServerProxy(uri, verbose=self.api.env.verbose)
def forward_call(self, name, *args, **kw): def forward_call(self, name, *args, **kw):
""" """
Forward a call over XML-RPC to an IPA server. Forward a call over XML-RPC to an IPA server.
""" """
client = self.get_client(verbose=api.env.get('verbose', False)) client = self.get_client()
command = getattr(client, name) command = getattr(client, name)
params = xmlrpc_marshal(*args, **kw) params = xmlrpc_marshal(*args, **kw)
try: try: