diff options
author | Todd Leonhardt <todd.leonhardt@gmail.com> | 2018-05-23 16:23:48 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-23 16:23:48 -0400 |
commit | 5d64ebee348aeffb02fc385f903c9af431e3721b (patch) | |
tree | 5802d2d54efba2402a8b13d73c14b6be975ba91b /cmd2/argcomplete_bridge.py | |
parent | c2594ff278ac50556cf4781910439ea1977a5873 (diff) | |
parent | 3d953628f1dbf7119001fa0751086b3b6016f764 (diff) | |
download | cmd2-git-5d64ebee348aeffb02fc385f903c9af431e3721b.tar.gz |
Merge pull request #411 from python-cmd2/autocompleter
Fixes problem with not passing the parameter hint suppression down to…
Diffstat (limited to 'cmd2/argcomplete_bridge.py')
-rw-r--r-- | cmd2/argcomplete_bridge.py | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/cmd2/argcomplete_bridge.py b/cmd2/argcomplete_bridge.py index 0ac68f1c..824710b0 100644 --- a/cmd2/argcomplete_bridge.py +++ b/cmd2/argcomplete_bridge.py @@ -16,6 +16,7 @@ else: except AttributeError: DEFAULT_COMPLETER = argcomplete.completers.FilesCompleter() + from cmd2.argparse_completer import ACTION_ARG_CHOICES, ACTION_SUPPRESS_HINT from contextlib import redirect_stdout import copy from io import StringIO @@ -245,7 +246,10 @@ else: if comp_type == 63: # type is 63 for second tab press print(outstr.rstrip(), file=argcomplete.debug_stream, end='') - output_stream.write(ifs.join([ifs, ' ']).encode(argcomplete.sys_encoding)) + if completions is not None: + output_stream.write(ifs.join([ifs, ' ']).encode(argcomplete.sys_encoding)) + else: + output_stream.write(ifs.join([]).encode(argcomplete.sys_encoding)) else: # if completions is None we assume we don't know how to handle it so let bash # go forward with normal filesystem completion @@ -253,3 +257,11 @@ else: output_stream.flush() argcomplete.debug_stream.flush() exit_method(0) + + + def bash_complete(action, show_hint: bool=True): + """Helper function to configure an argparse action to fall back to bash completion""" + def complete_none(*args, **kwargs): + return None + setattr(action, ACTION_SUPPRESS_HINT, not show_hint) + setattr(action, ACTION_ARG_CHOICES, (complete_none,)) |