Rework hooke.command.Command.handle_arguments (again :p).

Previous implementation didn't set params[name] when
  num_provided == 0 and argument.callback != None

diff --git a/hooke/command.py b/hooke/command.py
index 21e09b8060b51e16c2bd992b91452df4b74a45b5..5c0f1b2eacf007d7486ab9e1293459cd2357fe08 100644 (file)
--- a/hooke/command.py
+++ b/hooke/command.py
@@ -162,13 +162,15 @@ class Command (object):
                        '\n  '.join(['%s: %s' % (name,value)
                                     for name,value in sorted(settings)])))
             name,value = settings[0]
-            if name != argument.name:
-                params.remove(name)
+            if num_provided == 0:
                 params[argument.name] = value
-            if argument.callback != None:
-                if num_provided > 0:
+            else:
+                if name != argument.name:
+                    params.remove(name)
+                    params[argument.name] = value
+                if argument.callback != None:
                     value = argument.callback(hooke, self, argument, value)
-                params[argument.name] = value
+                    params[argument.name] = value
             argument.validate(value)
         return params