From a02beabe2d6a9601b69054eab268c2606c5837f4 Mon Sep 17 00:00:00 2001
From: Savannah Ostrowski <savannah@python.org>
Date: Mon, 4 May 2026 16:18:05 -0700
Subject: [PATCH] =?UTF-8?q?[3.13]=20GH-130750:=20Restore=20quoting=20of=20?=
 =?UTF-8?q?choices=20in=20argparse=20error=20messag=E2=80=A6=20(#149386)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[3.13] GH-130750: Restore quoting of choices in argparse error messages to match documentation and improve clarity (GH-144983)
(cherry picked from commit 53a7f76501923059188922be231db855265fe9a4)
---
 Lib/argparse.py                                               | 2 +-
 Lib/test/test_argparse.py                                     | 4 ++--
 .../Library/2026-02-19-04-40-57.gh-issue-130750.0hW52O.rst    | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Library/2026-02-19-04-40-57.gh-issue-130750.0hW52O.rst

diff --git a/Lib/argparse.py b/Lib/argparse.py
index a0faa3f41e2..7d845175644 100644
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -2601,7 +2601,7 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
                 choices = iter(choices)
             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)')
                 raise ArgumentError(action, msg % args)
 
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
index 91475180a1d..d118f334c0b 100644
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -1047,7 +1047,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'],
         )
@@ -2517,7 +2517,7 @@ class TestAddSubparsers(TestCase):
             parser.parse_args(('baz',))
         self.assertRegex(
             excinfo.exception.stderr,
-            r"error: argument {foo,bar}: invalid choice: 'baz' \(choose from foo, bar\)\n$"
+            r"error: argument {foo,bar}: invalid choice: 'baz' \(choose from 'foo', 'bar'\)\n$"
         )
 
     def test_optional_subparsers(self):
diff --git a/Misc/NEWS.d/next/Library/2026-02-19-04-40-57.gh-issue-130750.0hW52O.rst b/Misc/NEWS.d/next/Library/2026-02-19-04-40-57.gh-issue-130750.0hW52O.rst
new file mode 100644
index 00000000000..8bca48ab159
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2026-02-19-04-40-57.gh-issue-130750.0hW52O.rst
@@ -0,0 +1,2 @@
+Restore quoting of choices in :mod:`argparse` error messages for improved clarity and consistency with documentation.
+