Allow non-None empty default values in Args

Refs: #4058

diff --git a/kamaki/cli/argument/__init__.py b/kamaki/cli/argument/__init__.py
index bb52f94..5d8721d 100644 (file)
--- a/kamaki/cli/argument/__init__.py
+++ b/kamaki/cli/argument/__init__.py
@@ -67,7 +67,7 @@ class Argument(object):
                     self, name)
             assert name.startswith('-'), msg
 
-        self.default = default or (None if self.arity else False)
+        self.default = default if (default or self.arity) else False
 
     @property
     def value(self):
@@ -296,13 +296,13 @@ class KeyValueArgument(Argument):
         :param keyvalue_pairs: (str) ['key1=val1', 'key2=val2', ...]
         """
         self._value = {}
-        for pair in keyvalue_pairs:
-            key, sep, val = pair.partition('=')
-            if not sep:
-                raiseCLIError(
-                    CLISyntaxError('Argument syntax error '),
-                    details='%s is missing a "=" (usage: key1=val1 )\n' % pair)
+        try:
+            for pair in keyvalue_pairs:
+                key, sep, val = pair.partition('=')
+                assert sep, ' %s misses a "=" (usage: key1=val1 )\n' % (pair)
             self._value[key] = val
+        except Exception as e:
+            raiseCLIError(e, 'KeyValueArgument Syntax Error')
 
 
 class ProgressBarArgument(FlagArgument):

diff --git a/kamaki/cli/argument/test.py b/kamaki/cli/argument/test.py
index b55f617..50c13f7 100644 (file)
--- a/kamaki/cli/argument/test.py
+++ b/kamaki/cli/argument/test.py
@@ -75,7 +75,7 @@ class Argument(TestCase):
                 isinstance(parsed_name, list)) else [parsed_name, ]
             self.assertEqual(exp_name, a.parsed_name)
 
-            exp_default = default or (None if arity else False)
+            exp_default = default if (default or arity) else False
             self.assertEqual(exp_default, a.default)
 
     def test_value(self):
@@ -301,12 +301,15 @@ class KeyValueArgument(TestCase):
 
     def test_value(self):
         kva = argument.KeyValueArgument(parsed_name='--keyval')
-        self.assertEqual(kva.value, None)
+        self.assertEqual(kva.value, {})
         for kvpairs in (
                 'strval', 'key=val', 2.8, 42, None,
                 ('key', 'val'), ('key val'), ['=val', 'key=val'],
                 ['key1=val1', 'key2 val2'], ('key1 = val1', )):
-            self.assertRaises(errors.CLIError, kva.value, kvpairs)
+            try:
+                kva.value = kvpairs
+            except Exception as e:
+                self.assertTrue(isinstance(e, errors.CLIError))
         for kvpairs, exp in (
                 (('key=val', ), {'key': 'val'}),
                 (['key1=val1', 'key2=val2'], {'key1': 'val1', 'key2': 'val2'}),