Skip to content

5 small fixes #211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pmhahn wants to merge 5 commits into
base: main
Choose a base branch
from
Open

5 small fixes #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
864054e
test: Compare exc.type with `is`
Oct 10, 2025
827b6fa
main() does not return a value
Oct 10, 2025
9b2a478
Fix Action == SUPPRESS
Oct 10, 2025
d5b1fa3
bash: Fix detection of redirection
Oct 10, 2025
f3efb29
Fix spelling mistake: delim{e -> i}ter
Jun 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions shtab/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,9 +245,6 @@ def recurse(parser, prefix):
options_strings_str = "' '".join(get_option_strings(parser))
option_strings.append(f"{prefix}_option_strings=('{options_strings_str}')")
for optional in parser._get_optional_actions():
if optional == SUPPRESS:
continue

for option_string in optional.option_strings:
if hasattr(optional, "complete"):
# shtab `.complete = ...` functions
Expand Down Expand Up @@ -396,7 +393,7 @@ def complete_bash(parser, root_prefix=None, preamble="", choice_functions=None):

local prefix=${root_prefix}
local word_index=0
local pos_only=0 # "--" delimeter not encountered yet
local pos_only=0 # "--" delimiter not encountered yet
_set_parser_defaults
word_index=1

Expand Down Expand Up @@ -429,7 +426,7 @@ def complete_bash(parser, root_prefix=None, preamble="", choice_functions=None):
_set_new_action "pos_${completed_positional_actions}" true
fi
else
pos_only=1 # "--" delimeter encountered
pos_only=1 # "--" delimiter encountered
fi

let "word_index+=1"
Expand All @@ -440,8 +437,7 @@ def complete_bash(parser, root_prefix=None, preamble="", choice_functions=None):
if [[ $pos_only = 0 && "${completing_word}" == -* ]]; then
# optional argument started: use option strings
COMPREPLY=( $(compgen -W "${current_option_strings[*]}" -- "${completing_word}") )
elif [[ "${previous_word}" == ">" || "${previous_word}" == ">>" ||
"${previous_word}" =~ ^[12]">" || "${previous_word}" =~ ^[12]">>" ]]; then
elif [[ "${previous_word}" =~ ^[0-9\\&]*[\\<\\>]\\>?$ ]]; then
# handle redirection operators
COMPREPLY=( $(compgen -f -- "${completing_word}") )
else
Expand Down
3 changes: 1 addition & 2 deletions shtab/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import logging
import sys

from .main import main

if __name__ == "__main__":
logging.basicConfig(level=logging.INFO)
sys.exit(main(sys.argv[1:]) or 0)
main()
2 changes: 1 addition & 1 deletion tests/test_shtab.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ def test_add_argument_to_positional(shell, caplog, capsys):
completion_manual = shtab.complete(parser, shell=shell)
with pytest.raises(SystemExit) as exc:
sub._actions[-1](sub, Namespace(), shell)
assert exc.type == SystemExit
assert exc.type is SystemExit
assert exc.value.code == 0
completion, err = capsys.readouterr()
print(completion)
Expand Down