mirror of
https://github.com/python/cpython.git
synced 2025-07-23 03:05:38 +00:00
bpo-46080: fix argparse help generation exception in edge case (GH-30111)
Fix an uncaught exception during help text generation when
argparse.BooleanOptionalAction is used with default=argparse.SUPPRESS
and help is specified.
(cherry picked from commit 9e87c0e03f
)
Co-authored-by: Felix Fontein <felix@fontein.de>
This commit is contained in:
parent
876ade1ae3
commit
e5edc8d737
3 changed files with 9 additions and 3 deletions
|
@ -3597,6 +3597,8 @@ class TestHelpUsage(HelpTestCase):
|
|||
Sig('--bar', help='Whether to bar', default=True,
|
||||
action=argparse.BooleanOptionalAction),
|
||||
Sig('-f', '--foobar', '--barfoo', action=argparse.BooleanOptionalAction),
|
||||
Sig('--bazz', action=argparse.BooleanOptionalAction,
|
||||
default=argparse.SUPPRESS, help='Bazz!'),
|
||||
]
|
||||
argument_group_signatures = [
|
||||
(Sig('group'), [
|
||||
|
@ -3609,8 +3611,8 @@ class TestHelpUsage(HelpTestCase):
|
|||
usage = '''\
|
||||
usage: PROG [-h] [-w W [W ...]] [-x [X ...]] [--foo | --no-foo]
|
||||
[--bar | --no-bar]
|
||||
[-f | --foobar | --no-foobar | --barfoo | --no-barfoo] [-y [Y]]
|
||||
[-z Z Z Z]
|
||||
[-f | --foobar | --no-foobar | --barfoo | --no-barfoo]
|
||||
[--bazz | --no-bazz] [-y [Y]] [-z Z Z Z]
|
||||
a b b [c] [d ...] e [e ...]
|
||||
'''
|
||||
help = usage + '''\
|
||||
|
@ -3627,6 +3629,7 @@ class TestHelpUsage(HelpTestCase):
|
|||
--foo, --no-foo Whether to foo
|
||||
--bar, --no-bar Whether to bar (default: True)
|
||||
-f, --foobar, --no-foobar, --barfoo, --no-barfoo
|
||||
--bazz, --no-bazz Bazz!
|
||||
|
||||
group:
|
||||
-y [Y] y
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue