From 126b31de5581f4107d7d863f606a9adfa782f88a Mon Sep 17 00:00:00 2001 From: Jason Gerard DeRose Date: Wed, 24 Sep 2008 05:42:31 +0000 Subject: 328: Command.get_default() now returns defaults for all values not present, not just defaults that aren't None --- ipalib/frontend.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'ipalib/frontend.py') diff --git a/ipalib/frontend.py b/ipalib/frontend.py index d4550f87..cb18a07a 100644 --- a/ipalib/frontend.py +++ b/ipalib/frontend.py @@ -322,9 +322,7 @@ class Command(plugable.Plugin): def __get_default_iter(self, kw): for param in self.params(): if param.name not in kw: - value = param.get_default(**kw) - if value is not None: - yield(param.name, value) + yield (param.name, param.get_default(**kw)) def get_default(self, **kw): return dict(self.__get_default_iter(kw)) @@ -356,7 +354,7 @@ class Command(plugable.Plugin): kw = self.convert(**kw) kw.update(self.get_default(**kw)) self.validate(**kw) - args = tuple(kw.pop(name, None) for name in self.args) + args = tuple(kw.pop(name) for name in self.args) return self.run(*args, **kw) def run(self, *args, **kw): -- cgit