summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-02-14 08:18:23 (GMT)
committerGeorg Brandl <georg@python.org>2010-02-14 08:18:23 (GMT)
commit4a670c5572bf19ffc3a2118338a424b04434d3a9 (patch)
tree2c10dc4dc31ac4d01ad5ba32094cba8b9613b3d1
parenta68f7b8a0d439a0963c5de4205e9519ad95ff5f1 (diff)
downloadcpython-4a670c5572bf19ffc3a2118338a424b04434d3a9.zip
cpython-4a670c5572bf19ffc3a2118338a424b04434d3a9.tar.gz
cpython-4a670c5572bf19ffc3a2118338a424b04434d3a9.tar.bz2
#7926: fix stray parens.
-rw-r--r--Doc/whatsnew/2.6.rst11
1 files changed, 6 insertions, 5 deletions
diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst
index ea67ba1..8bfbbab 100644
--- a/Doc/whatsnew/2.6.rst
+++ b/Doc/whatsnew/2.6.rst
@@ -346,9 +346,10 @@ A high-level explanation of the context management protocol is:
* The code in *BLOCK* is executed.
-* If *BLOCK* raises an exception, the :meth:`__exit__(type, value, traceback)`
- is called with the exception details, the same values returned by
- :func:`sys.exc_info`. The method's return value controls whether the exception
+* If *BLOCK* raises an exception, the context manager's :meth:`__exit__` method
+ is called with three arguments, the exception details (``type, value, traceback``,
+ the same values returned by :func:`sys.exc_info`, which can also be ``None``
+ if no exception occurred). The method's return value controls whether an exception
is re-raised: any false value re-raises the exception, and ``True`` will result
in suppressing it. You'll only rarely want to suppress the exception, because
if you do the author of the code containing the ':keyword:`with`' statement will
@@ -459,7 +460,7 @@ could be written as::
with db_transaction(db) as cursor:
...
-The :mod:`contextlib` module also has a :func:`nested(mgr1, mgr2, ...)` function
+The :mod:`contextlib` module also has a ``nested(mgr1, mgr2, ...)`` function
that combines a number of context managers so you don't need to write nested
':keyword:`with`' statements. In this example, the single ':keyword:`with`'
statement both starts a database transaction and acquires a thread lock::
@@ -468,7 +469,7 @@ statement both starts a database transaction and acquires a thread lock::
with nested (db_transaction(db), lock) as (cursor, locked):
...
-Finally, the :func:`closing(object)` function returns *object* so that it can be
+Finally, the :func:`closing` function returns its argument so that it can be
bound to a variable, and calls ``object.close`` at the end of the block. ::
import urllib, sys