From 99d7638ff5c5cddb4f23d25ad13ef122476d5679 Mon Sep 17 00:00:00 2001 From: Jason Gerard DeRose Date: Tue, 12 Aug 2008 16:49:23 +0000 Subject: 115: CLI now parses out kw args; cmd.__call__() now uses print_n_call() to give feedback on the calling --- ipalib/public.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'ipalib/public.py') diff --git a/ipalib/public.py b/ipalib/public.py index e66e1368..c1e644d5 100644 --- a/ipalib/public.py +++ b/ipalib/public.py @@ -208,15 +208,15 @@ class cmd(plugable.Plugin): print '%s.%s(%s)' % ( self.name, method, - ' '.join('%s=%r' % (k, v) for (k, v) in kw.items()), + ', '.join('%s=%r' % (k, v) for (k, v) in kw.items()), ) - getattr(self, method)(**kw) + return getattr(self, method)(**kw) def __call__(self, **kw): - kw = self.normalize(**kw) - kw.update(self.default(**kw)) - self.validate(**kw) - return self.execute(**kw) + kw = self.print_n_call('normalize', kw) + kw.update(self.print_n_call('default', kw)) + self.print_n_call('validate', kw) + return self.print_n_call('execute', kw) class obj(plugable.Plugin): -- cgit