pybind/mgr/mgr_module: infer non-positional args

Once we have an Optional[bool], we can always transition to non-positional,
since we never have a non-optional bool.  Same goes for the 'format'
arg.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/pybind/mgr/mgr_module.py b/src/pybind/mgr/mgr_module.py
index f78b45493b893bf533b7e2f594d031af1b836070..42469fc9a61e26389ec41c40461f8aa3e6816d30 100644 (file)
--- a/src/pybind/mgr/mgr_module.py
+++ b/src/pybind/mgr/mgr_module.py
@@ -331,6 +331,14 @@ class CLICommand(object):
             if arg == '_end_positional_':
                 positional = False
                 continue
+            if (
+                arg == 'format'
+                or arg_spec[arg] is Optional[bool]
+                or arg_spec[arg] is bool
+            ):
+                # implicit switch to non-positional on any
+                # Optional[bool] or the --format option
+                positional = False
             assert arg in arg_spec, \
                 f"'{arg}' is not annotated for {f}: {full_argspec}"
             has_default = index >= first_default