Skip to content

Commit

Permalink
pythongh-109475: Fix support of explicit option value "--" in argparse
Browse files Browse the repository at this point in the history
For example "--option=--".
  • Loading branch information
serhiy-storchaka committed Jan 31, 2024
1 parent b905fad commit 6a0f705
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Lib/argparse.py
Expand Up @@ -2489,7 +2489,7 @@ def parse_known_intermixed_args(self, args=None, namespace=None):
# ========================
def _get_values(self, action, arg_strings):
# for everything but PARSER, REMAINDER args, strip out first '--'
if action.nargs not in [PARSER, REMAINDER]:
if not action.option_strings and action.nargs not in [PARSER, REMAINDER]:
try:
arg_strings.remove('--')
except ValueError:
Expand Down
16 changes: 16 additions & 0 deletions Lib/test/test_argparse.py
Expand Up @@ -5405,6 +5405,22 @@ def test_zero_or_more_optional(self):
args = parser.parse_args([])
self.assertEqual(NS(x=[]), args)

def test_double_dash(self):
parser = argparse.ArgumentParser()
parser.add_argument('-f', '--foo', nargs='*')
parser.add_argument('bar', nargs='*')

args = parser.parse_args(['--foo=--'])
self.assertEqual(NS(foo=['--'], bar=[]), args)
args = parser.parse_args(['--foo', '--'])
self.assertEqual(NS(foo=[], bar=[]), args)
args = parser.parse_args(['-f--'])
self.assertEqual(NS(foo=['--'], bar=[]), args)
args = parser.parse_args(['-f', '--'])
self.assertEqual(NS(foo=[], bar=[]), args)
args = parser.parse_args(['--foo', 'a', 'b', '--', 'c', 'd'])
self.assertEqual(NS(foo=['a', 'b'], bar=['c', 'd']), args)


# ===========================
# parse_intermixed_args tests
Expand Down
@@ -0,0 +1,2 @@
Fix support of explicit option value "--" in :mod:`argparse` (e.g.
``--option=--``).

0 comments on commit 6a0f705

Please sign in to comment.