bpo-38438: Simplify argparse "star nargs" usage. (GH-17106)
diff --git a/Lib/argparse.py b/Lib/argparse.py
index 13af7ac..94e1b8a 100644
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -591,7 +591,11 @@
elif action.nargs == OPTIONAL:
result = '[%s]' % get_metavar(1)
elif action.nargs == ZERO_OR_MORE:
- result = '[%s [%s ...]]' % get_metavar(2)
+ metavar = get_metavar(1)
+ if len(metavar) == 2:
+ result = '[%s [%s ...]]' % metavar
+ else:
+ result = '[%s ...]' % metavar
elif action.nargs == ONE_OR_MORE:
result = '%s [%s ...]' % get_metavar(2)
elif action.nargs == REMAINDER:
diff --git a/Lib/pydoc_data/topics.py b/Lib/pydoc_data/topics.py
index 1fb19f2..d3559e4 100644
--- a/Lib/pydoc_data/topics.py
+++ b/Lib/pydoc_data/topics.py
@@ -3903,7 +3903,7 @@
'is\n'
' first hit. The arguments are the same as for "break".\n'
'\n'
- 'cl(ear) [filename:lineno | bpnumber [bpnumber ...]]\n'
+ 'cl(ear) [filename:lineno | bpnumber ...]\n'
'\n'
' With a *filename:lineno* argument, clear all the breakpoints '
'at\n'
@@ -3913,7 +3913,7 @@
'first\n'
' ask confirmation).\n'
'\n'
- 'disable [bpnumber [bpnumber ...]]\n'
+ 'disable [bpnumber ...]\n'
'\n'
' Disable the breakpoints given as a space separated list of\n'
' breakpoint numbers. Disabling a breakpoint means it cannot '
@@ -3922,7 +3922,7 @@
'breakpoint, it\n'
' remains in the list of breakpoints and can be (re-)enabled.\n'
'\n'
- 'enable [bpnumber [bpnumber ...]]\n'
+ 'enable [bpnumber ...]\n'
'\n'
' Enable the breakpoints specified.\n'
'\n'
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
index a97c921..60bf199 100644
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -2163,7 +2163,7 @@
def test_subparser2_help(self):
self._test_subparser_help('5.0 2 -h', textwrap.dedent('''\
- usage: PROG bar 2 [-h] [-y {1,2,3}] [z [z ...]]
+ usage: PROG bar 2 [-h] [-y {1,2,3}] [z ...]
2 description
@@ -2697,10 +2697,10 @@
]
usage_when_not_required = '''\
- usage: PROG [-h] [--foo | --spam SPAM | badger [badger ...]]
+ usage: PROG [-h] [--foo | --spam SPAM | badger ...]
'''
usage_when_required = '''\
- usage: PROG [-h] (--foo | --spam SPAM | badger [badger ...])
+ usage: PROG [-h] (--foo | --spam SPAM | badger ...)
'''
help = '''\
@@ -3494,11 +3494,11 @@
])
]
usage = '''\
- usage: PROG [-h] [-w W [W ...]] [-x [X [X ...]]] [--foo | --no-foo]
+ 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]
- a b b [c] [d [d ...]] e [e ...]
+ a b b [c] [d ...] e [e ...]
'''
help = usage + '''\
@@ -3510,7 +3510,7 @@
optional arguments:
-h, --help show this help message and exit
-w W [W ...] w
- -x [X [X ...]] x
+ -x [X ...] x
--foo, --no-foo Whether to foo
--bar, --no-bar Whether to bar (default: True)
-f, --foobar, --no-foobar, --barfoo, --no-barfoo
@@ -5113,7 +5113,7 @@
self.do_test_exception(nargs="*", metavar=tuple())
def test_nargs_zeroormore_metavar_length1(self):
- self.do_test_exception(nargs="*", metavar=("1",))
+ self.do_test_no_exception(nargs="*", metavar=("1",))
def test_nargs_zeroormore_metavar_length2(self):
self.do_test_no_exception(nargs="*", metavar=("1", "2"))