330: Command.normalize() now normalizes all keys, not just keys in params

2 files changed, 3 insertions, 9 deletions

diff --git a/ipalib/frontend.py b/ipalib/frontend.py
index fc397530..f3264d81 100644
--- a/ipalib/frontend.py
+++ b/ipalib/frontend.py
@@ -304,15 +304,10 @@ class Command(plugable.Plugin):
             (k, self.params[k].convert(v)) for (k, v) in kw.iteritems()
         )
 
-    def __normalize_iter(self, kw):
-        for (key, value) in kw.iteritems():
-            if key in self.params:
-                yield (key, self.params[key].normalize(value))
-            else:
-                yield (key, value)
-
     def normalize(self, **kw):
-        return dict(self.__normalize_iter(kw))
+        return dict(
+            (k, self.params[k].normalize(v)) for (k, v) in kw.iteritems()
+        )
 
     def __get_default_iter(self, kw):
         for param in self.params():
diff --git a/ipalib/tests/test_frontend.py b/ipalib/tests/test_frontend.py
index db831caa..88232bed 100644
--- a/ipalib/tests/test_frontend.py
+++ b/ipalib/tests/test_frontend.py
@@ -504,7 +504,6 @@ class test_Command(ClassChecker):
         kw = dict(
             option0=u'OPTION0',
             option1=u'OPTION1',
-            option2=u'option2',
         )
         norm = dict((k, v.lower()) for (k, v) in kw.items())
         sub = self.subcls()