From 244346dbcbe999bb921ee792ddc2ac222532cc56 Mon Sep 17 00:00:00 2001
From: Jason Gerard DeRose <jderose@redhat.com>
Date: Thu, 22 Jan 2009 18:48:21 -0700
Subject: More work on xmlrpc stuff, started migrated more code to use errors2
 instead of errors

---
 ipalib/frontend.py | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

(limited to 'ipalib/frontend.py')

diff --git a/ipalib/frontend.py b/ipalib/frontend.py
index 6efccbb4d..565060b5d 100644
--- a/ipalib/frontend.py
+++ b/ipalib/frontend.py
@@ -97,17 +97,28 @@ class Command(plugable.Plugin):
         XML-RPC and the executed an the nearest IPA server.
         """
         params = self.args_options_2_params(*args, **options)
+        self.info(
+            '%s(%s)', self.name, ', '.join(self.__repr_iter(params))
+        )
         params = self.normalize(**params)
         params = self.convert(**params)
         params.update(self.get_default(**params))
         self.validate(**params)
         (args, options) = self.params_2_args_options(**params)
-        # FIXME: don't log passords!
-        self.info(make_repr(self.name, *args, **options))
         result = self.run(*args, **options)
-        self.debug('%s result: %r', self.name, result)
+        self.debug('result from %s(): %r', self.name, result)
         return result
 
+    def __repr_iter(self, params):
+        for arg in self.args():
+            value = params.get(arg.name, None)
+            yield '%r' % (arg.safe_value(value),)
+        for option in self.options():
+            if option.name not in params:
+                continue
+            value = params[option.name]
+            yield '%s=%r' % (option.name, option.safe_value(value))
+
     def args_options_2_params(self, *args, **options):
         """
         Merge (args, options) into params.
@@ -245,10 +256,7 @@ class Command(plugable.Plugin):
         """
         for param in self.params():
             value = kw.get(param.name, None)
-            if value is not None:
-                param.validate(value)
-            elif param.required:
-                raise errors.RequirementError(param.name)
+            param.validate(value)
 
     def run(self, *args, **options):
         """
-- 
cgit