From e4ee132b99c22f70a2f6513b08a5b7c0e24b458a Mon Sep 17 00:00:00 2001
From: Jan Chren ~rindeal <dev.rindeal@gmail.com>
Date: Wed, 25 Sep 2024 14:20:50 +0000
Subject: [PATCH] argparse: use str() consistently and explicitly to print
 choices

Fixes: https://github.com/python/cpython/issues/118839

Signed-off-by: Jan Chren ~rindeal <dev.rindeal@gmail.com>
---
 Lib/argparse.py                                      | 12 +++++-------
 Lib/test/test_argparse.py                            |  2 +-
 .../2024-04-19-05-58-50.gh-issue-117766.J3xepp.rst   |  1 +
 3 files changed, 7 insertions(+), 8 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Library/2024-04-19-05-58-50.gh-issue-117766.J3xepp.rst

diff --git a/Lib/argparse.py b/Lib/argparse.py
index 690b2a9db9481b1..b7c2b0451f056bf 100644
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -548,8 +548,7 @@ def _metavar_formatter(self, action, default_metavar):
         if action.metavar is not None:
             result = action.metavar
         elif action.choices is not None:
-            choice_strs = [str(choice) for choice in action.choices]
-            result = '{%s}' % ','.join(choice_strs)
+            result = '{%s}' % ','.join(map(str, action.choices))
         else:
             result = default_metavar
 
@@ -597,8 +596,7 @@ def _expand_help(self, action):
             if hasattr(params[name], '__name__'):
                 params[name] = params[name].__name__
         if params.get('choices') is not None:
-            choices_str = ', '.join([str(c) for c in params['choices']])
-            params['choices'] = choices_str
+            params['choices'] = ', '.join(map(str, params['choices']))
         return self._get_help_string(action) % params
 
     def _iter_indented_subactions(self, action):
@@ -707,7 +705,7 @@ def _get_action_name(argument):
     elif argument.dest not in (None, SUPPRESS):
         return argument.dest
     elif argument.choices:
-        return '{' + ','.join(argument.choices) + '}'
+        return '{%s}' % ','.join(map(str, argument.choices))
     else:
         return None
 
@@ -2556,8 +2554,8 @@ def _check_value(self, action, value):
         # converted value must be one of the choices (if specified)
         if action.choices is not None and value not in action.choices:
             args = {'value': value,
-                    'choices': ', '.join(map(repr, action.choices))}
-            msg = _('invalid choice: %(value)r (choose from %(choices)s)')
+                    'choices': ', '.join(map(str, action.choices))}
+            msg = _('invalid choice: %(value)s (choose from %(choices)s)')
             raise ArgumentError(action, msg % args)
 
     # =======================
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
index ef05a6fefcffcce..23af2416248da0a 100644
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -2399,7 +2399,7 @@ def test_wrong_argument_subparsers_no_destination_error(self):
             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/2024-04-19-05-58-50.gh-issue-117766.J3xepp.rst b/Misc/NEWS.d/next/Library/2024-04-19-05-58-50.gh-issue-117766.J3xepp.rst
new file mode 100644
index 000000000000000..d090f931f0238d9
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-04-19-05-58-50.gh-issue-117766.J3xepp.rst
@@ -0,0 +1 @@
+Always use :func:`str` to print ``choices`` in :mod:`argparse`.