python · encukou · Jul 23, 2021 · Jul 23, 2021
diff --git a/Lib/argparse.py b/Lib/argparse.py
@@ -727,6 +727,8 @@ def _get_action_name(argument):
        return argument.metavar
    elif argument.dest not in (None, SUPPRESS):
        return argument.dest
+    elif argument.choices:
+        return '{' + ','.join(argument.choices) + '}'
    else:
        return None


diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
@@ -2060,6 +2060,30 @@ def test_required_subparsers_default(self):
        ret = parser.parse_args(())
        self.assertIsNone(ret.command)

+    def test_required_subparsers_no_destination_error(self):
+        parser = ErrorRaisingArgumentParser()
+        subparsers = parser.add_subparsers(required=True)
+        subparsers.add_parser('foo')
+        subparsers.add_parser('bar')
+        with self.assertRaises(ArgumentParserError) as excinfo:
+            parser.parse_args(())
+        self.assertRegex(
+            excinfo.exception.stderr,
+            'error: the following arguments are required: {foo,bar}\n$'
+        )
+
+    def test_wrong_argument_subparsers_no_destination_error(self):
+        parser = ErrorRaisingArgumentParser()
+        subparsers = parser.add_subparsers(required=True)
+        subparsers.add_parser('foo')
+        subparsers.add_parser('bar')
+        with self.assertRaises(ArgumentParserError) as excinfo:
+            parser.parse_args(('baz',))
+        self.assertRegex(
+            excinfo.exception.stderr,
+            r"error: argument {foo,bar}: invalid choice: 'baz' \(choose from 'foo', 'bar'\)\n$"
+        )
+
    def test_optional_subparsers(self):
        parser = ErrorRaisingArgumentParser()
        subparsers = parser.add_subparsers(dest='command', required=False)

diff --git a/Misc/NEWS.d/next/Library/2017-09-20-14-43-03.bpo-29298._78CSN.rst b/Misc/NEWS.d/next/Library/2017-09-20-14-43-03.bpo-29298._78CSN.rst
@@ -0,0 +1,2 @@
+Fix ``TypeError`` when required subparsers without ``dest`` do not receive
+arguments. Patch by Anthony Sottile.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Fix ``TypeError`` when required subparsers without ``dest`` do not receive
		arguments. Patch by Anthony Sottile.