diff options
| -rw-r--r-- | ipalib/frontend.py | 11 | ||||
| -rw-r--r-- | ipalib/tests/test_frontend.py | 2 |
2 files changed, 3 insertions, 10 deletions
diff --git a/ipalib/frontend.py b/ipalib/frontend.py index cb18a07a..fc397530 100644 --- a/ipalib/frontend.py +++ b/ipalib/frontend.py @@ -299,15 +299,10 @@ class Command(plugable.Plugin): for option in self.get_options(): yield create_param(option) - def __convert_iter(self, kw): - for (key, value) in kw.iteritems(): - if key in self.params: - yield (key, self.params[key].convert(value)) - else: - yield (key, value) - def convert(self, **kw): - return dict(self.__convert_iter(kw)) + return dict( + (k, self.params[k].convert(v)) for (k, v) in kw.iteritems() + ) def __normalize_iter(self, kw): for (key, value) in kw.iteritems(): diff --git a/ipalib/tests/test_frontend.py b/ipalib/tests/test_frontend.py index 4ddf11b3..db831caa 100644 --- a/ipalib/tests/test_frontend.py +++ b/ipalib/tests/test_frontend.py @@ -486,8 +486,6 @@ class test_Command(ClassChecker): kw = dict( option0='option0', option1='option1', - whatever=False, - also=object, ) expected = dict(kw) expected.update(dict(option0=u'option0', option1=u'option1')) |