[Python-checkins] r86813 - in python/branches/release27-maint: Doc/library/bdb.rst Doc/tutorial/stdlib.rst Doc/whatsnew/2.7.rst
georg.brandl
python-checkins at python.org
Fri Nov 26 19:26:04 CET 2010
Author: georg.brandl
Date: Fri Nov 26 19:26:04 2010
New Revision: 86813
Log:
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.
........
Modified:
python/branches/release27-maint/ (props changed)
python/branches/release27-maint/Doc/library/bdb.rst
python/branches/release27-maint/Doc/tutorial/stdlib.rst
python/branches/release27-maint/Doc/whatsnew/2.7.rst
Modified: python/branches/release27-maint/Doc/library/bdb.rst
==============================================================================
--- python/branches/release27-maint/Doc/library/bdb.rst (original)
+++ python/branches/release27-maint/Doc/library/bdb.rst Fri Nov 26 19:26:04 2010
@@ -342,12 +342,10 @@
.. 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.
Modified: python/branches/release27-maint/Doc/tutorial/stdlib.rst
==============================================================================
--- python/branches/release27-maint/Doc/tutorial/stdlib.rst (original)
+++ python/branches/release27-maint/Doc/tutorial/stdlib.rst Fri Nov 26 19:26:04 2010
@@ -14,11 +14,11 @@
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
Modified: python/branches/release27-maint/Doc/whatsnew/2.7.rst
==============================================================================
--- python/branches/release27-maint/Doc/whatsnew/2.7.rst (original)
+++ python/branches/release27-maint/Doc/whatsnew/2.7.rst Fri Nov 26 19:26:04 2010
@@ -244,7 +244,7 @@
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
More information about the Python-checkins
mailing list