From 12ea8efc0b05f361a5871451cb095753c8c6cc16 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Thu, 24 Apr 2008 10:25:30 -0400 Subject: Add --verbose option so the HTTP headers and XML request/response can be seen. Also re-do the way modules are imported. I was attemping to have ^C handled gracefully but the way I did it could mask other problems. 443987 --- ipa-python/ipaclient.py | 4 ++-- ipa-python/rpcclient.py | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'ipa-python') diff --git a/ipa-python/ipaclient.py b/ipa-python/ipaclient.py index 4fc83695..1cd541c3 100644 --- a/ipa-python/ipaclient.py +++ b/ipa-python/ipaclient.py @@ -25,13 +25,13 @@ import radius_util class IPAClient: - def __init__(self,transport=None): + def __init__(self,transport=None,verbose=False): if transport: self.local = True self.transport = transport else: self.local = False - self.transport = rpcclient.RPCClient() + self.transport = rpcclient.RPCClient(verbose) def set_principal(self,princ): """Set the name of the principal that will be used for diff --git a/ipa-python/rpcclient.py b/ipa-python/rpcclient.py index 1c8e751b..aaaa5bbc 100644 --- a/ipa-python/rpcclient.py +++ b/ipa-python/rpcclient.py @@ -31,13 +31,17 @@ from ipa import config class RPCClient: - def __init__(self): + def __init__(self, verbose=False): self.server = None + self.verbose = verbose config.init_config() def server_url(self, server): """Build the XML-RPC server URL from our configuration""" - return "https://" + server + "/ipaxml" + url = "https://" + server + "/ipaxml" + if self.verbose: + print "Connecting to IPA server: %s" % url + return url def setup_server(self): """Create our XML-RPC server connection using kerberos @@ -59,7 +63,7 @@ class RPCClient: else: raise e - return xmlrpclib.ServerProxy(self.server_url(self.server), KerbTransport()) + return xmlrpclib.ServerProxy(self.server_url(self.server), KerbTransport(), verbose=self.verbose) # Higher-level API -- cgit