PublicArchive/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-05-06 04:37:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

[3.14] GH-130750: Restore quoting of choices in argparse error messag… (#149385)

Browse Source 
[3.14] GH-130750: Restore quoting of choices in argparse error messages to match documentation and improve clarity (GH-144983)
(cherry picked from commit 53a7f76501)
This commit is contained in:
Savannah Ostrowski
2026-05-04 15:22:54 -07:00
committed by GitHub
parent 316f6265b7
commit a458589a7e
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Lib/argparse.py
+1 -1
View File
@@ -2678,7 +2678,7 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
if value not in choices:
args = {'value': str(value),
'choices': ', '.join(map(str, action.choices))}
'choices': ', '.join(repr(str(choice)) for choice in action.choices)}
msg = _('invalid choice: %(value)r (choose from %(choices)s)')
if self.suggest_on_error and isinstance(value, str):
Lib/test/test_argparse.py
+8 -8
View File
@@ -1045,7 +1045,7 @@ class TestStrEnumChoices(TestCase):
parser.add_argument('--color', choices=self.Color)
self.assertRaisesRegex(
argparse.ArgumentError,
r"invalid choice: 'yellow' \(choose from red, green, blue\)",
r"invalid choice: 'yellow' \(choose from 'red', 'green', 'blue'\)",
parser.parse_args,
['--color', 'yellow'],
)
@@ -2313,7 +2313,7 @@ class TestArgumentAndSubparserSuggestions(TestCase):
with self.assertRaises(ArgumentParserError) as excinfo:
parser.parse_args(('bazz',))
self.assertIn(
"error: argument foo: invalid choice: 'bazz', maybe you meant 'baz'? (choose from bar, baz)",
"error: argument foo: invalid choice: 'bazz', maybe you meant 'baz'? (choose from 'bar', 'baz')",
excinfo.exception.stderr
)
@@ -2323,7 +2323,7 @@ class TestArgumentAndSubparserSuggestions(TestCase):
with self.assertRaises(ArgumentParserError) as excinfo:
parser.parse_args(('bazz',))
self.assertIn(
"error: argument foo: invalid choice: 'bazz' (choose from bar, baz)",
"error: argument foo: invalid choice: 'bazz' (choose from 'bar', 'baz')",
excinfo.exception.stderr,
)
@@ -2336,7 +2336,7 @@ class TestArgumentAndSubparserSuggestions(TestCase):
parser.parse_args(('baz',))
self.assertIn(
"error: argument {foo,bar}: invalid choice: 'baz', maybe you meant"
" 'bar'? (choose from foo, bar)",
" 'bar'? (choose from 'foo', 'bar')",
excinfo.exception.stderr,
)
@@ -2348,7 +2348,7 @@ class TestArgumentAndSubparserSuggestions(TestCase):
with self.assertRaises(ArgumentParserError) as excinfo:
parser.parse_args(('baz',))
self.assertIn(
"error: argument {foo,bar}: invalid choice: 'baz' (choose from foo, bar)",
"error: argument {foo,bar}: invalid choice: 'baz' (choose from 'foo', 'bar')",
excinfo.exception.stderr,
)
@@ -2358,7 +2358,7 @@ class TestArgumentAndSubparserSuggestions(TestCase):
with self.assertRaises(ArgumentParserError) as excinfo:
parser.parse_args(('bazz',))
self.assertIn(
"error: argument foo: invalid choice: 'bazz' (choose from bar, baz)",
"error: argument foo: invalid choice: 'bazz' (choose from 'bar', 'baz')",
excinfo.exception.stderr,
)
@@ -2378,7 +2378,7 @@ class TestArgumentAndSubparserSuggestions(TestCase):
with self.assertRaises(ArgumentParserError) as excinfo:
parser.parse_args(('3',))
self.assertIn(
"error: argument foo: invalid choice: '3' (choose from 1, 2)",
"error: argument foo: invalid choice: '3' (choose from '1', '2')",
excinfo.exception.stderr,
)
@@ -2388,7 +2388,7 @@ class TestArgumentAndSubparserSuggestions(TestCase):
with self.assertRaises(ArgumentParserError) as excinfo:
parser.parse_args(('3',))
self.assertIn(
"error: argument foo: invalid choice: '3' (choose from 1, 2)",
"error: argument foo: invalid choice: '3' (choose from '1', '2')",
excinfo.exception.stderr,
)
Misc/NEWS.d/next/Library/2026-02-19-04-40-57.gh-issue-130750.0hW52O.rst
+2
View File
@@ -0,0 +1,2 @@
Restore quoting of choices in :mod:`argparse` error messages for improved clarity and consistency with documentation.