diff options
| author | R. David Murray <rdmurray@bitdance.com> | 2010-08-03 18:14:01 (GMT) |
|---|---|---|
| committer | R. David Murray <rdmurray@bitdance.com> | 2010-08-03 18:14:01 (GMT) |
| commit | 1cbf78e040b1ddfe7a1520d21ea34e1098848713 (patch) | |
| tree | 6a32364130570d6302f2b94aae36d0d72847ee97 /Lib/argparse.py | |
| parent | 0f98128d6e9a2375bb560a58418e83ebd1996f2b (diff) | |
| download | cpython-1cbf78e040b1ddfe7a1520d21ea34e1098848713.zip cpython-1cbf78e040b1ddfe7a1520d21ea34e1098848713.tar.gz cpython-1cbf78e040b1ddfe7a1520d21ea34e1098848713.tar.bz2 | |
Merged revisions 83675 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r83675 | r.david.murray | 2010-08-03 13:56:09 -0400 (Tue, 03 Aug 2010) | 12 lines
#9444: use first of prefix_chars for help opt instead of raising error
An argparse option parser created with a prefix_chars that did not
include a '-' would happily add -h and --help options, and then throw
an error when it tried to format the help because the - was an invalid
prefix character. This patch makes it use the first character of
prefix_chars as the character for the help options if and only if '-'
is not one of the valid prefix_chars.
Fix by Theodore Turocy, unit tests by Catherine Devlin.
........
Diffstat (limited to 'Lib/argparse.py')
| -rw-r--r-- | Lib/argparse.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Lib/argparse.py b/Lib/argparse.py index f9279aa..654ac48 100644 --- a/Lib/argparse.py +++ b/Lib/argparse.py @@ -1563,13 +1563,16 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer): # add help and version arguments if necessary # (using explicit default to override global argument_default) + default_prefix = '-' if '-' in prefix_chars else prefix_chars[0] if self.add_help: self.add_argument( - '-h', '--help', action='help', default=SUPPRESS, + default_prefix+'h', default_prefix*2+'help', + action='help', default=SUPPRESS, help=_('show this help message and exit')) if self.version: self.add_argument( - '-v', '--version', action='version', default=SUPPRESS, + default_prefix+'v', default_prefix*2+'version', + action='version', default=SUPPRESS, version=self.version, help=_("show program's version number and exit")) |