diff options
author | Antony Lee <anntzer.lee@gmail.com> | 2022-05-01 06:04:50 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-01 06:04:50 (GMT) |
commit | ad5e8520f3e117f45481513014548a39879d30d2 (patch) | |
tree | e967814e58ce8cd84ad3debc8f6ff91781991ef8 | |
parent | 9588f880a286a8cc5597188f6ab44108c8f18761 (diff) | |
download | cpython-ad5e8520f3e117f45481513014548a39879d30d2.zip cpython-ad5e8520f3e117f45481513014548a39879d30d2.tar.gz cpython-ad5e8520f3e117f45481513014548a39879d30d2.tar.bz2 |
bpo-39716: Raise on conflicting subparser names. (GH-18605)
Raise an ArgumentError when the same subparser name is added twice to an
ArgumentParser. This is consistent with the (default) behavior when the
same option string is added twice to an ArgumentParser.
(Support for `conflict_handler="resolve"` could be considered as a
followup feature, although real use cases seem even rarer than
"resolve"ing option-strings.)
Automerge-Triggered-By: GH:rhettinger
-rw-r--r-- | Lib/argparse.py | 7 | ||||
-rw-r--r-- | Lib/test/test_argparse.py | 13 | ||||
-rw-r--r-- | Misc/NEWS.d/next/Library/2020-02-22-12-02-11.bpo-39716.z2WhDQ.rst | 3 |
3 files changed, 23 insertions, 0 deletions
diff --git a/Lib/argparse.py b/Lib/argparse.py index 668e1d4..c47aeff 100644 --- a/Lib/argparse.py +++ b/Lib/argparse.py @@ -1171,6 +1171,13 @@ class _SubParsersAction(Action): aliases = kwargs.pop('aliases', ()) + if name in self._name_parser_map: + raise ArgumentError(self, _('conflicting subparser: %s') % name) + for alias in aliases: + if alias in self._name_parser_map: + raise ArgumentError( + self, _('conflicting subparser alias: %s') % alias) + # create a pseudo-action to hold the choice help if 'help' in kwargs: help = kwargs.pop('help') diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py index 5777cb5..794b9df 100644 --- a/Lib/test/test_argparse.py +++ b/Lib/test/test_argparse.py @@ -4804,6 +4804,19 @@ class TestConflictHandling(TestCase): --spam NEW_SPAM ''')) + def test_subparser_conflict(self): + parser = argparse.ArgumentParser() + sp = parser.add_subparsers() + sp.add_parser('fullname', aliases=['alias']) + self.assertRaises(argparse.ArgumentError, + sp.add_parser, 'fullname') + self.assertRaises(argparse.ArgumentError, + sp.add_parser, 'alias') + self.assertRaises(argparse.ArgumentError, + sp.add_parser, 'other', aliases=['fullname']) + self.assertRaises(argparse.ArgumentError, + sp.add_parser, 'other', aliases=['alias']) + # ============================= # Help and Version option tests diff --git a/Misc/NEWS.d/next/Library/2020-02-22-12-02-11.bpo-39716.z2WhDQ.rst b/Misc/NEWS.d/next/Library/2020-02-22-12-02-11.bpo-39716.z2WhDQ.rst new file mode 100644 index 0000000..f122811 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-02-22-12-02-11.bpo-39716.z2WhDQ.rst @@ -0,0 +1,3 @@ +Raise an ArgumentError when the same subparser name is added twice to an +`argparse.ArgumentParser`. This is consistent with the (default) behavior +when the same option string is added twice to an ArgumentParser. |