diff options
| author | Georg Brandl <georg@python.org> | 2010-11-26 18:26:04 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-11-26 18:26:04 (GMT) |
| commit | 86fed7d3a6b80ebd9c85ca381c2e2cc83c128e34 (patch) | |
| tree | 4a268b4c25d41d06e92ca461db2682f7c043e6a5 | |
| parent | 93f7a321e708ba082965a8a72997f269b1ff5e15 (diff) | |
| download | cpython-86fed7d3a6b80ebd9c85ca381c2e2cc83c128e34.zip cpython-86fed7d3a6b80ebd9c85ca381c2e2cc83c128e34.tar.gz cpython-86fed7d3a6b80ebd9c85ca381c2e2cc83c128e34.tar.bz2 | |
Merged revisions 86794,86798,86801 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r86794 | georg.brandl | 2010-11-26 12:50:13 +0100 (Fr, 26 Nov 2010) | 1 line
#10526: fix typo.
........
r86798 | georg.brandl | 2010-11-26 13:05:48 +0100 (Fr, 26 Nov 2010) | 1 line
#10420: fix docs of bdb.effective().
........
r86801 | georg.brandl | 2010-11-26 13:12:14 +0100 (Fr, 26 Nov 2010) | 1 line
Better example for os.system(): do not change the system time.
........
| -rw-r--r-- | Doc/library/bdb.rst | 10 | ||||
| -rw-r--r-- | Doc/tutorial/stdlib.rst | 6 | ||||
| -rw-r--r-- | Doc/whatsnew/2.7.rst | 2 |
3 files changed, 8 insertions, 10 deletions
diff --git a/Doc/library/bdb.rst b/Doc/library/bdb.rst index c0c3dc8..93304de 100644 --- a/Doc/library/bdb.rst +++ b/Doc/library/bdb.rst @@ -342,12 +342,10 @@ Finally, the module defines the following functions: .. function:: effective(file, line, frame) Determine if there is an effective (active) breakpoint at this line of code. - Return breakpoint number or 0 if none. - - Called only if we know there is a breakpoint at this location. Returns the - breakpoint that was triggered and a flag that indicates if it is ok to delete - a temporary breakpoint. + Return a tuple of the breakpoint and a boolean that indicates if it is ok + to delete a temporary breakpoint. Return ``(None, None)`` if there is no + matching breakpoint. .. function:: set_trace() - Starts debugging with a :class:`Bdb` instance from caller's frame. + Start debugging with a :class:`Bdb` instance from caller's frame. diff --git a/Doc/tutorial/stdlib.rst b/Doc/tutorial/stdlib.rst index 955ce73..844f8bc 100644 --- a/Doc/tutorial/stdlib.rst +++ b/Doc/tutorial/stdlib.rst @@ -14,11 +14,11 @@ The :mod:`os` module provides dozens of functions for interacting with the operating system:: >>> import os - >>> os.system('time 0:02') - 0 >>> os.getcwd() # Return the current working directory 'C:\\Python26' - >>> os.chdir('/server/accesslogs') + >>> os.chdir('/server/accesslogs') # Change current working directory + >>> os.system('mkdir today') # Run the command mkdir in the system shell + 0 Be sure to use the ``import os`` style instead of ``from os import *``. This will keep :func:`os.open` from shadowing the built-in :func:`open` function which diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst index 5ba22a7..6cd3aba 100644 --- a/Doc/whatsnew/2.7.rst +++ b/Doc/whatsnew/2.7.rst @@ -244,7 +244,7 @@ The standard library now supports use of ordered dictionaries in several modules. * The :mod:`ConfigParser` module uses them by default, meaning that - configuration files can now read, modified, and then written back + configuration files can now be read, modified, and then written back in their original order. * The :meth:`~collections.somenamedtuple._asdict()` method for |