Just quote everything, since its all a str anyway

Author: savannahostrowski

Lib/argparse.py

@@ -2757,14 +2757,8 @@ def _check_value(self, action, value):
             choices = iter(choices)
 
         if value not in choices:
-            def _format_choice(choice):
-                # For enum members, use repr of the value, not the enum itself
-                if hasattr(choice, 'value'):
-                    return repr(choice.value)
-                return repr(choice)
-
             args = {'value': str(value),
-                    'choices': ', '.join(map(_format_choice, 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

@@ -2468,7 +2468,7 @@ def test_suggestions_choices_mixed_types(self):
         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

@@ -1 +1,2 @@
-Restore quoting of choices in :mod:`argparse` error messages for improved clarity and consistency with documentation. Enum members are handled specially to show just their quoted values.
+Restore quoting of choices in :mod:`argparse` error messages for improved clarity and consistency with documentation.
+