diff options
| -rw-r--r-- | ipalib/public.py | 12 | ||||
| -rw-r--r-- | ipalib/tests/test_public.py | 16 |
2 files changed, 14 insertions, 14 deletions
diff --git a/ipalib/public.py b/ipalib/public.py index 9e999879..78d4a7a4 100644 --- a/ipalib/public.py +++ b/ipalib/public.py @@ -175,7 +175,7 @@ class Option(plugable.Plugin): class Command(plugable.Plugin): __public__ = frozenset(( 'normalize', - 'default', + 'get_default', 'validate', 'execute', '__call__', @@ -231,16 +231,16 @@ class Command(plugable.Plugin): self.print_call('normalize', kw, 1) return dict(self.normalize_iter(kw)) - def default_iter(self, kw): + def get_default_iter(self, kw): for option in self.options(): if option.name not in kw: - value = option.default(**kw) + value = option.get_default(**kw) if value is not None: yield(option.name, value) - def default(self, **kw): + def get_default(self, **kw): self.print_call('default', kw, 1) - return dict(self.default_iter(kw)) + return dict(self.get_default_iter(kw)) def validate(self, **kw): self.print_call('validate', kw, 1) @@ -268,7 +268,7 @@ class Command(plugable.Plugin): print '' self.print_call('__call__', kw) kw = self.normalize(**kw) - kw.update(self.default(**kw)) + kw.update(self.get_default(**kw)) self.validate(**kw) self.execute(**kw) diff --git a/ipalib/tests/test_public.py b/ipalib/tests/test_public.py index 609ac33e..3ed1f5da 100644 --- a/ipalib/tests/test_public.py +++ b/ipalib/tests/test_public.py @@ -210,7 +210,6 @@ class test_Option(ClassChecker): assert o.get_default(key0=7) == 3 - class test_Command(ClassChecker): """ Tests the `public.Command` class. @@ -225,8 +224,9 @@ class test_Command(ClassChecker): def my_rule(self, value): if value != self.name: return 'must equal %r' % self.name - def default(self, **kw): - return kw['default_from'] + default_from = public.DefaultFrom( + lambda arg: arg, 'default_from' + ) class option0(my_option): pass @@ -282,11 +282,11 @@ class test_Command(ClassChecker): sub = self.subcls() assert sub.normalize(**kw) == norm - def test_default(self): + def test_get_default(self): """ - Tests the `public.Command.default` method. + Tests the `public.Command.get_default` method. """ - assert 'default' in self.cls.__public__ # Public + assert 'get_default' in self.cls.__public__ # Public no_fill = dict( option0='value0', option1='value1', @@ -300,8 +300,8 @@ class test_Command(ClassChecker): option1='the default', ) sub = self.subcls() - assert sub.default(**no_fill) == {} - assert sub.default(**fill) == default + assert sub.get_default(**no_fill) == {} + assert sub.get_default(**fill) == default def test_validate(self): """ |