Allow passing empty lists to some options

Signed-off-by: František Nečas <fifinecas@seznam.cz>
rebase-helper · Mar 16, 2020 · bb86b2c · bb86b2c
1 parent 55caf93
commit bb86b2c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/rebasehelper/argument_parser.py b/rebasehelper/argument_parser.py
@@ -55,6 +55,7 @@ def __init__(self, option_strings,
                  dest=None,
                  default=None,
                  nargs=None,
+                 const=None,
                  required=False,
                  type=None,  # pylint: disable=redefined-builtin
                  metavar=None,
@@ -64,6 +65,7 @@ def __init__(self, option_strings,
         super(CustomAction, self).__init__(
             option_strings=option_strings,
             dest=dest,
+            const=const,
             default=default,
             required=required,
             metavar=metavar,
@@ -95,7 +97,8 @@ class CustomArgumentParser(argparse.ArgumentParser):
     def _check_value(self, action, value):
         if isinstance(value, list):
             # converted value must be subset of the choices (if specified)
-            if action.choices is not None and not set(value).issubset(action.choices):
+            empty = value == action.const
+            if action.choices is not None and not empty and not set(value).issubset(action.choices):
                 invalid = set(value).difference(action.choices)
                 if len(invalid) == 1:
                     tup = repr(invalid.pop()), ', '.join(map(repr, action.choices))

diff --git a/rebasehelper/options.py b/rebasehelper/options.py
@@ -83,6 +83,8 @@
         "name": ["--pkgcomparetool"],
         "choices": plugin_manager.checkers.get_all_plugins(),
         "available_choices": plugin_manager.checkers.get_supported_plugins(),
+        "nargs": "?",
+        "const": [""],
         "default": plugin_manager.checkers.get_default_plugins(),
         "type": lambda s: s.split(','),
         "help": "set of tools to use for package comparison, defaults to "
@@ -107,6 +109,8 @@
         "name": ["--versioneer-blacklist"],
         "choices": plugin_manager.versioneers.get_all_plugins(),
         "available_choices": plugin_manager.versioneers.get_supported_plugins(),
+        "nargs": "?",
+        "const": [""],
         "default": [],
         "type": lambda s: s.split(","),
         "help": "prevent specified versioneers from being run",
@@ -115,6 +119,8 @@
         "name": ["--spec-hook-blacklist"],
         "choices": plugin_manager.spec_hooks.get_all_plugins(),
         "available_choices": plugin_manager.spec_hooks.get_supported_plugins(),
+        "nargs": "?",
+        "const": [""],
         "default": [],
         "type": lambda s: s.split(","),
         "help": "prevent specified spec hooks from being run",
@@ -123,6 +129,8 @@
         "name": ["--build-log-hook-blacklist"],
         "choices": plugin_manager.build_log_hooks.get_all_plugins(),
         "available_choices": plugin_manager.build_log_hooks.get_supported_plugins(),
+        "nargs": "?",
+        "const": [""],
         "default": [],
         "type": lambda s: s.split(","),
         "help": "prevent specified build log hooks from being run"

diff --git a/rebasehelper/tests/functional/test_rebase.py b/rebasehelper/tests/functional/test_rebase.py
@@ -161,7 +161,7 @@ def test_files_build_log_hook(self, buildtool):
             '--force-build-log-hooks',
             '--buildtool', buildtool,
             '--outputtool', 'json',
-            '--pkgcomparetool', 'rpmdiff',  # FIXME: no checkers are actually needed here
+            '--pkgcomparetool', '',
             '--color=always',
             new_version,
         ])