diff options
| author | Georg Brandl <georg@python.org> | 2010-08-01 19:02:09 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-08-01 19:02:09 (GMT) |
| commit | 0347c71c5f520d1c60f9e3006a0124203a31ec73 (patch) | |
| tree | 8f7887934c48e92dc6a561f85a143a362e8f5e78 /Doc | |
| parent | 78e6957cdf091318e4b31d17008fbaa08fffa6a2 (diff) | |
| download | cpython-0347c71c5f520d1c60f9e3006a0124203a31ec73.zip cpython-0347c71c5f520d1c60f9e3006a0124203a31ec73.tar.gz cpython-0347c71c5f520d1c60f9e3006a0124203a31ec73.tar.bz2 | |
Merged revisions 83385-83389,83391 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r83385 | georg.brandl | 2010-08-01 08:42:45 +0200 (So, 01 Aug 2010) | 1 line
#8773: mailbox.py does not need to be executable.
........
r83386 | georg.brandl | 2010-08-01 08:44:46 +0200 (So, 01 Aug 2010) | 1 line
#8768: name test method properly so that it gets executed.
........
r83387 | georg.brandl | 2010-08-01 08:53:28 +0200 (So, 01 Aug 2010) | 1 line
#8735: better explain semantics of *values* argument for parse().
........
r83388 | georg.brandl | 2010-08-01 09:48:43 +0200 (So, 01 Aug 2010) | 1 line
#7395: fix traceback in do_add() when no stats are loaded. Apply same fix for do_sort() and do_reverse().
........
r83389 | georg.brandl | 2010-08-01 09:57:47 +0200 (So, 01 Aug 2010) | 1 line
Small improvements to pstats browser: do not crash on reading invalid file, and actually do a reload when executing "read" as intended.
........
r83391 | georg.brandl | 2010-08-01 10:10:08 +0200 (So, 01 Aug 2010) | 1 line
Add another news entry.
........
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/optparse.rst | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Doc/library/optparse.rst b/Doc/library/optparse.rst index 9d5b9ff..13649bc 100644 --- a/Doc/library/optparse.rst +++ b/Doc/library/optparse.rst @@ -1238,8 +1238,9 @@ where the input parameters are the list of arguments to process (default: ``sys.argv[1:]``) ``values`` - object to store option arguments in (default: a new instance of - :class:`optparse.Values`) + a :class:`optparse.Values` object to store option arguments in (default: a + new instance of :class:`Values`) -- if you give an existing object, the + option defaults will not be initialized on it and the return values are |