https://github.com/python/cpython/commit/e1976399cd08a0aadeb094cee46b4ebf468fecd9
commit: e1976399cd08a0aadeb094cee46b4ebf468fecd9
branch: 3.11
author: Serhiy Storchaka <[email protected]>
committer: serhiy-storchaka <[email protected]>
date: 2024-02-05T21:04:11Z
summary:
[3.11] gh-109475: Fix support of explicit option value "--" in argparse
(GH-114814) (GH-115037)
For example "--option=--".
(cherry picked from commit 4aa4f0906df9fc9c6c6f6657f2c521468c6b1688)
files:
A Misc/NEWS.d/next/Library/2024-01-31-20-07-11.gh-issue-109475.lmTb9S.rst
M Lib/argparse.py
M Lib/test/test_argparse.py
diff --git a/Lib/argparse.py b/Lib/argparse.py
index 9962e61a679ebe..a999ea60614632 100644
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -2464,7 +2464,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:
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
index 6322ebbb8405ee..adee4f3dc27fbd 100644
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -5272,6 +5272,23 @@ def test_mixed(self):
self.assertEqual(NS(v=3, spam=True, badger="B"), args)
self.assertEqual(["C", "--foo", "4"], extras)
+ 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
# ===========================
diff --git
a/Misc/NEWS.d/next/Library/2024-01-31-20-07-11.gh-issue-109475.lmTb9S.rst
b/Misc/NEWS.d/next/Library/2024-01-31-20-07-11.gh-issue-109475.lmTb9S.rst
new file mode 100644
index 00000000000000..7582cb2bcd7629
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-01-31-20-07-11.gh-issue-109475.lmTb9S.rst
@@ -0,0 +1,2 @@
+Fix support of explicit option value "--" in :mod:`argparse` (e.g.
+``--option=--``).
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
