IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

198: Renamed Command.default() to Command.get_default(); Command.get_default_iter() now correctly calls Option.get_default() instead of Option.default()

Browse Source
This commit is contained in:
Jason Gerard DeRose 2008-08-26 19:13:55 +00:00
parent 0e47948695
commit 845c0d8bc6
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ipalib/public.py
View File

@ -175,7 +175,7 @@ class Option(plugable.Plugin):
class Command(plugable.Plugin): class Command(plugable.Plugin):
__public__ = frozenset(( __public__ = frozenset((
'normalize', 'normalize',
'default', 'get_default',
'validate', 'validate',
'execute', 'execute',
'__call__', '__call__',
@ -231,16 +231,16 @@ class Command(plugable.Plugin):
self.print_call('normalize', kw, 1) self.print_call('normalize', kw, 1)
return dict(self.normalize_iter(kw)) return dict(self.normalize_iter(kw))
def default_iter(self, kw): def get_default_iter(self, kw):
for option in self.options(): for option in self.options():
if option.name not in kw: if option.name not in kw:
value = option.default(**kw) value = option.get_default(**kw)
if value is not None: if value is not None:
yield(option.name, value) yield(option.name, value)
def default(self, **kw): def get_default(self, **kw):
self.print_call('default', kw, 1) self.print_call('default', kw, 1)
return dict(self.default_iter(kw)) return dict(self.get_default_iter(kw))
def validate(self, **kw): def validate(self, **kw):
self.print_call('validate', kw, 1) self.print_call('validate', kw, 1)
@ -268,7 +268,7 @@ class Command(plugable.Plugin):
print '' print ''
self.print_call('__call__', kw) self.print_call('__call__', kw)
kw = self.normalize(**kw) kw = self.normalize(**kw)
kw.update(self.default(**kw)) kw.update(self.get_default(**kw))
self.validate(**kw) self.validate(**kw)
self.execute(**kw) self.execute(**kw)

16
ipalib/tests/test_public.py
View File

@ -210,7 +210,6 @@ class test_Option(ClassChecker):
assert o.get_default(key0=7) == 3 assert o.get_default(key0=7) == 3
class test_Command(ClassChecker): class test_Command(ClassChecker):
""" """
Tests the `public.Command` class. Tests the `public.Command` class.
@ -225,8 +224,9 @@ class test_Command(ClassChecker):
def my_rule(self, value): def my_rule(self, value):
if value != self.name: if value != self.name:
return 'must equal %r' % self.name return 'must equal %r' % self.name
def default(self, **kw): default_from = public.DefaultFrom(
return kw['default_from'] lambda arg: arg, 'default_from'
)
class option0(my_option): class option0(my_option):
pass pass
@ -282,11 +282,11 @@ class test_Command(ClassChecker):
sub = self.subcls() sub = self.subcls()
assert sub.normalize(**kw) == norm 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( no_fill = dict(
option0='value0', option0='value0',
option1='value1', option1='value1',
@ -300,8 +300,8 @@ class test_Command(ClassChecker):
option1='the default', option1='the default',
) )
sub = self.subcls() sub = self.subcls()
assert sub.default(**no_fill) == {} assert sub.get_default(**no_fill) == {}
assert sub.default(**fill) == default assert sub.get_default(**fill) == default
def test_validate(self): def test_validate(self):
""" """