Fix logic bug for list kwargs

anntzer · Feb 8, 2016 · 9c9b3ae · 9c9b3ae
1 parent 8c1d1ba
commit 9c9b3ae
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/defopt.py b/defopt.py
@@ -114,16 +114,18 @@ def _populate_parser(func, parser):
         type_ = _get_type(doc.params[name].type)
         if param.kind == param.VAR_KEYWORD:
             raise ValueError('**kwargs not supported')
-        if param.default == param.empty:
-            if type_.container:
-                assert type_.container == list
-                name_or_flag = '--' + name
-                kwargs['nargs'] = '*'
+        if type_.container:
+            assert type_.container == list
+            name_or_flag = '--' + name
+            kwargs['nargs'] = '*'
+            if param.default == param.empty:
                 kwargs['required'] = True
             else:
-                name_or_flag = name
-                if param.kind == param.VAR_POSITIONAL:
-                    kwargs['nargs'] = '*'
+                kwargs['default'] = param.default
+        elif param.default == param.empty:
+            name_or_flag = name
+            if param.kind == param.VAR_POSITIONAL:
+                kwargs['nargs'] = '*'
         else:
             name_or_flag = '--' + name
             kwargs['default'] = param.default

diff --git a/test_defopt.py b/test_defopt.py
@@ -170,6 +170,16 @@ def main(foo):
             self.assertEqual(foo, [1.1, 2.2])
         defopt.run(['--foo', '1.1', '2.2'])
 
+    def test_list_kwarg(self):
+        @defopt.main
+        def main(foo=None):
+            """Test function
+
+            :type foo: list[float]
+            """
+            self.assertEqual(foo, [1.1, 2.2])
+        defopt.run(['--foo', '1.1', '2.2'])
+
     def test_other_container(self):
         @defopt.main
         def main(foo):