Skip to content

gh-81691: Fix handling of multiple "--" (double dashes) in argparse #124233

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

Merged
serhiy-storchaka merged 2 commits into from
Sep 20, 2024
Merged

gh-81691: Fix handling of multiple "--" (double dashes) in argparse #124233

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34884b2
gh-81691: Fix handling of multiple "--" (double dashes) in argparse
serhiy-storchaka Sep 19, 2024
2560f6e
Minimize diff.
serhiy-storchaka Sep 20, 2024
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
Prev Previous commit
Minimize diff.
  • Loading branch information
@serhiy-storchaka
serhiy-storchaka committed Sep 20, 2024
commit 2560f6e32f2736fdf5d52ec7f34794e006d67c3f
9 changes: 3 additions & 6 deletions Lib/argparse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1916,14 +1916,12 @@ def _parse_known_args(self, arg_strings, namespace):
# which has an 'O' if there is an option at an index,
# an 'A' if there is an argument, or a '-' if there is a '--'
option_string_indices = {}
double_dash_index = len(arg_strings)
arg_string_pattern_parts = []
arg_strings_iter = iter(arg_strings)
for i, arg_string in enumerate(arg_strings_iter):

# all args after -- are non-options
if arg_string == '--':
double_dash_index = i
arg_string_pattern_parts.append('-')
for arg_string in arg_strings_iter:
arg_string_pattern_parts.append('A')
Expand Down Expand Up @@ -2073,10 +2071,9 @@ def consume_positionals(start_index):
for action, arg_count in zip(positionals, arg_counts):
args = arg_strings[start_index: start_index + arg_count]
# Strip out the first '--' if it is not in PARSER or REMAINDER arg.
if (arg_count
and start_index <= double_dash_index < start_index + arg_count
and action.nargs not in [PARSER, REMAINDER]):
assert args.index('--') == double_dash_index - start_index
if (action.nargs not in [PARSER, REMAINDER]
and arg_strings_pattern.find('-', start_index,
start_index + arg_count) >= 0):
args.remove('--')
start_index += arg_count
if args and action.deprecated and action.dest not in warned:
Expand Down