diff options
author | Georg Brandl <georg@python.org> | 2009-09-16 16:00:31 (GMT) |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2009-09-16 16:00:31 (GMT) |
commit | ee8783d0fcb937fd69a0a448bb80af7c4a438e18 (patch) | |
tree | b0925d8684ee8fe4b892997d8d7cb14397031f70 /Doc/library/optparse.rst | |
parent | e32fd1d90f17c60110c92aebcb3233dfa2d89fb9 (diff) | |
download | cpython-ee8783d0fcb937fd69a0a448bb80af7c4a438e18.zip cpython-ee8783d0fcb937fd69a0a448bb80af7c4a438e18.tar.gz cpython-ee8783d0fcb937fd69a0a448bb80af7c4a438e18.tar.bz2 |
Merged revisions 74817-74820,74822-74824 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r74817 | georg.brandl | 2009-09-16 11:05:11 +0200 (Mi, 16 Sep 2009) | 1 line
Make deprecation notices as visible as warnings are right now.
........
r74818 | georg.brandl | 2009-09-16 11:23:04 +0200 (Mi, 16 Sep 2009) | 1 line
#6880: add reference to classes section in exceptions section, which comes earlier.
........
r74819 | georg.brandl | 2009-09-16 11:24:57 +0200 (Mi, 16 Sep 2009) | 1 line
#6876: fix base class constructor invocation in example.
........
r74820 | georg.brandl | 2009-09-16 11:30:48 +0200 (Mi, 16 Sep 2009) | 1 line
#6891: comment out dead link to Unicode article.
........
r74822 | georg.brandl | 2009-09-16 12:12:06 +0200 (Mi, 16 Sep 2009) | 1 line
#5621: refactor description of how class/instance attributes interact on a.x=a.x+1 or augassign.
........
r74823 | georg.brandl | 2009-09-16 15:06:22 +0200 (Mi, 16 Sep 2009) | 1 line
Remove strange trailing commas.
........
r74824 | georg.brandl | 2009-09-16 15:11:06 +0200 (Mi, 16 Sep 2009) | 1 line
#6892: fix optparse example involving help option.
........
Diffstat (limited to 'Doc/library/optparse.rst')
-rw-r--r-- | Doc/library/optparse.rst | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Doc/library/optparse.rst b/Doc/library/optparse.rst index a62ad24..05aa378 100644 --- a/Doc/library/optparse.rst +++ b/Doc/library/optparse.rst @@ -467,7 +467,7 @@ user-friendly (documented) options:: action="store_false", dest="verbose", help="be vewwy quiet (I'm hunting wabbits)") parser.add_option("-f", "--filename", - metavar="FILE", help="write output to FILE"), + metavar="FILE", help="write output to FILE") parser.add_option("-m", "--mode", default="intermediate", help="interaction mode: novice, intermediate, " @@ -1014,12 +1014,15 @@ must specify for any option using that action. from optparse import OptionParser, SUPPRESS_HELP - parser = OptionParser() - parser.add_option("-h", "--help", action="help"), + # usually, a help option is added automatically, but that can + # be suppressed using the add_help_option argument + parser = OptionParser(add_help_option=False) + + parser.add_option("-h", "--help", action="help") parser.add_option("-v", action="store_true", dest="verbose", help="Be moderately verbose") parser.add_option("--file", dest="filename", - help="Input file to read data from"), + help="Input file to read data from") parser.add_option("--secret", help=SUPPRESS_HELP) If :mod:`optparse` sees either ``"-h"`` or ``"--help"`` on the command line, it |