Ensure quotes around suggestions

Author: savannahostrowski

Lib/argparse.py

@@ -2757,8 +2757,14 @@ 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(str, action.choices))}
+                    'choices': ', '.join(map(_format_choice, 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

@@ -1123,7 +1123,7 @@ def test_invalid_enum_value_raises_error(self):
         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'],
         )
@@ -2392,7 +2392,7 @@ def test_wrong_argument_error_with_suggestions(self):
         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
         )
 
@@ -2402,7 +2402,7 @@ def test_wrong_argument_error_no_suggestions(self):
         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,
         )
 
@@ -2415,7 +2415,7 @@ def test_wrong_argument_subparsers_with_suggestions(self):
             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,
         )
 
@@ -2427,7 +2427,7 @@ def test_wrong_argument_subparsers_no_suggestions(self):
         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,
         )
 
@@ -2438,7 +2438,7 @@ def test_wrong_argument_with_suggestion_explicit(self):
             parser.parse_args(('bazz',))
         self.assertIn(
             "error: argument foo: invalid choice: 'bazz', maybe you meant"
-             " 'baz'? (choose from bar, baz)",
+             " 'baz'? (choose from 'bar', 'baz')",
             excinfo.exception.stderr,
         )
 
@@ -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,
         )