Skip to content

Commit e197639

Browse files
[3.11] gh-109475: Fix support of explicit option value "--" in argparse (GH-114814) (GH-115037)
For example "--option=--". (cherry picked from commit 4aa4f09)
1 parent 98b2f46 commit e197639

File tree

3 files changed

+20
-1
lines changed

3 files changed

+20
-1
lines changed

Lib/argparse.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2464,7 +2464,7 @@ def parse_known_intermixed_args(self, args=None, namespace=None):
24642464
# ========================
24652465
def _get_values(self, action, arg_strings):
24662466
# for everything but PARSER, REMAINDER args, strip out first '--'
2467-
if action.nargs not in [PARSER, REMAINDER]:
2467+
if not action.option_strings and action.nargs not in [PARSER, REMAINDER]:
24682468
try:
24692469
arg_strings.remove('--')
24702470
except ValueError:

Lib/test/test_argparse.py

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5272,6 +5272,23 @@ def test_mixed(self):
52725272
self.assertEqual(NS(v=3, spam=True, badger="B"), args)
52735273
self.assertEqual(["C", "--foo", "4"], extras)
52745274

5275+
def test_double_dash(self):
5276+
parser = argparse.ArgumentParser()
5277+
parser.add_argument('-f', '--foo', nargs='*')
5278+
parser.add_argument('bar', nargs='*')
5279+
5280+
args = parser.parse_args(['--foo=--'])
5281+
self.assertEqual(NS(foo=['--'], bar=[]), args)
5282+
args = parser.parse_args(['--foo', '--'])
5283+
self.assertEqual(NS(foo=[], bar=[]), args)
5284+
args = parser.parse_args(['-f--'])
5285+
self.assertEqual(NS(foo=['--'], bar=[]), args)
5286+
args = parser.parse_args(['-f', '--'])
5287+
self.assertEqual(NS(foo=[], bar=[]), args)
5288+
args = parser.parse_args(['--foo', 'a', 'b', '--', 'c', 'd'])
5289+
self.assertEqual(NS(foo=['a', 'b'], bar=['c', 'd']), args)
5290+
5291+
52755292
# ===========================
52765293
# parse_intermixed_args tests
52775294
# ===========================
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Fix support of explicit option value "--" in :mod:`argparse` (e.g.
2+
``--option=--``).

0 commit comments

Comments
 (0)