diff options
| author | Kevin Van Brunt <kmvanbrunt@gmail.com> | 2019-05-06 23:56:37 -0400 |
|---|---|---|
| committer | Kevin Van Brunt <kmvanbrunt@gmail.com> | 2019-05-06 23:56:37 -0400 |
| commit | 3685eff4c61153bb626f8ce2873424b32a9df790 (patch) | |
| tree | 7d04a503716ab94349f4bcc048206eb74375b166 | |
| parent | 19633def42c67d5c75786c58db16efe0c4a86a45 (diff) | |
| download | cmd2-git-3685eff4c61153bb626f8ce2873424b32a9df790.tar.gz | |
Removed try/except in argparse completion code since we don't want to suppress exceptions
| -rw-r--r-- | cmd2/argparse_completer.py | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/cmd2/argparse_completer.py b/cmd2/argparse_completer.py index ac65185b..659742bb 100644 --- a/cmd2/argparse_completer.py +++ b/cmd2/argparse_completer.py @@ -678,19 +678,16 @@ class AutoCompleter(object): list_args = arg_choices[index] elif isinstance(arg_choices[index], dict): kw_args = arg_choices[index] - try: - # call the provided function differently depending on the provided positional and keyword arguments - if list_args is not None and kw_args is not None: - return completer(text, line, begidx, endidx, *list_args, **kw_args) - elif list_args is not None: - return completer(text, line, begidx, endidx, *list_args) - elif kw_args is not None: - return completer(text, line, begidx, endidx, **kw_args) - else: - return completer(text, line, begidx, endidx) - except TypeError: - # assume this is due to an incorrect function signature, return nothing. - return [] + + # call the provided function differently depending on the provided positional and keyword arguments + if list_args is not None and kw_args is not None: + return completer(text, line, begidx, endidx, *list_args, **kw_args) + elif list_args is not None: + return completer(text, line, begidx, endidx, *list_args) + elif kw_args is not None: + return completer(text, line, begidx, endidx, **kw_args) + else: + return completer(text, line, begidx, endidx) else: return self._cmd2_app.basic_complete(text, line, begidx, endidx, self._resolve_choices_for_arg(action, used_values)) |