bpo-38438: Simplify argparse "star nargs" usage. (GH-17106)

This commit is contained in:
Brandt Bucher 2019-11-11 12:47:48 -08:00 • committed by Raymond Hettinger
parent 84ac437658
commit a0ed99bca8
6 changed files with 20 additions and 15 deletions

View file

@ -591,7 +591,11 @@ class HelpFormatter(object):
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: