diff options
| -rw-r--r-- | ipalib/public.py | 9 | ||||
| -rw-r--r-- | ipalib/tests/test_public.py | 3 |
2 files changed, 5 insertions, 7 deletions
diff --git a/ipalib/public.py b/ipalib/public.py index 045f1012..c2c3a449 100644 --- a/ipalib/public.py +++ b/ipalib/public.py @@ -162,7 +162,7 @@ class Option(plugable.ReadOnly): default = self.default_from(**kw) if default is not None: return self.convert(default) - return self.convert(self.default) + return self.default def get_values(self): if self.type.name in ('Enum', 'CallbackEnum'): @@ -208,16 +208,13 @@ class Command(plugable.Plugin): return dict(self.__convert_iter(kw)) def __normalize_iter(self, kw): - for (key, value) in kw.items(): + for (key, value) in kw.iteritems(): if key in self.Option: - yield ( - key, self.Option[key].normalize(value) - ) + yield (key, self.Option[key].normalize(value)) else: yield (key, value) def normalize(self, **kw): - self.print_call('normalize', kw, 1) return dict(self.__normalize_iter(kw)) def __get_default_iter(self, kw): diff --git a/ipalib/tests/test_public.py b/ipalib/tests/test_public.py index 4df55d2f..ac1ae818 100644 --- a/ipalib/tests/test_public.py +++ b/ipalib/tests/test_public.py @@ -293,6 +293,7 @@ class test_Option(ClassChecker): assert o.get_default(first='John', last='Doe') == 'Hello, John Doe!' # Scenario 2: multivalue=True + default = (default,) o = self.cls(name, doc, type_, default=default, default_from=default_from, @@ -300,7 +301,7 @@ class test_Option(ClassChecker): ) assert o.default is default assert o.default_from is default_from - assert o.get_default() == (default,) + assert o.get_default() == default assert o.get_default(first='John', last='Doe') == ('Hello, John Doe!',) def test_get_value(self): |