diff options
author | Georg Brandl <georg@python.org> | 2009-05-25 21:13:36 (GMT) |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2009-05-25 21:13:36 (GMT) |
commit | 8a1e4c4b6433522ff20528e87b642e4316bd2bd6 (patch) | |
tree | 34f4e397b78bfa4d45ff63fd569b22a5320e4993 /Doc/library/optparse.rst | |
parent | 0c31562a913e9a49842bd73c04847861c23774f1 (diff) | |
download | cpython-8a1e4c4b6433522ff20528e87b642e4316bd2bd6.zip cpython-8a1e4c4b6433522ff20528e87b642e4316bd2bd6.tar.gz cpython-8a1e4c4b6433522ff20528e87b642e4316bd2bd6.tar.bz2 |
Merged revisions 72661,72675-72677,72679,72712,72801,72820 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r72661 | georg.brandl | 2009-05-15 10:03:03 +0200 (Fr, 15 Mai 2009) | 1 line
Fix example output for doctest-like demos.
........
r72675 | georg.brandl | 2009-05-16 13:13:21 +0200 (Sa, 16 Mai 2009) | 1 line
#6034: clarify __reversed__ doc.
........
r72676 | georg.brandl | 2009-05-16 13:14:46 +0200 (Sa, 16 Mai 2009) | 1 line
#6025: fix signature of parse().
........
r72677 | georg.brandl | 2009-05-16 13:18:55 +0200 (Sa, 16 Mai 2009) | 1 line
#6009: undocument default argument of Option as deprecated.
........
r72679 | georg.brandl | 2009-05-16 13:24:41 +0200 (Sa, 16 Mai 2009) | 1 line
Fix about and bugs pages to match real workflow.
........
r72712 | georg.brandl | 2009-05-17 10:55:00 +0200 (So, 17 Mai 2009) | 1 line
#5935: mention that BROWSER is looked for in PATH.
........
r72801 | georg.brandl | 2009-05-20 20:31:14 +0200 (Mi, 20 Mai 2009) | 1 line
#6055: refer to "sqlite3" consistently.
........
r72820 | georg.brandl | 2009-05-22 09:23:32 +0200 (Fr, 22 Mai 2009) | 1 line
Use raise X(y).
........
Diffstat (limited to 'Doc/library/optparse.rst')
-rw-r--r-- | Doc/library/optparse.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/optparse.rst b/Doc/library/optparse.rst index 2cf8042..eae6121 100644 --- a/Doc/library/optparse.rst +++ b/Doc/library/optparse.rst @@ -1072,10 +1072,10 @@ to a particular option, or fail to pass a required option attribute, tells :mod:`optparse` where to write it: :attr:`dest` names an attribute of the ``options`` object that :mod:`optparse` builds as it parses the command line. -* ``default`` (deprecated) +* ``default`` The value to use for this option's destination if the option is not seen on the - command line. Deprecated; use ``parser.set_defaults()`` instead. + command line. See also ``parser.set_defaults()``. * ``nargs`` (default: 1) |