[Python-checkins] cpython (merge 3.2 -> default): merge 3.2

[benjamin.peterson]

http://hg.python.org/cpython/rev/fdcb6935f3f2
changeset:   74258:fdcb6935f3f2
parent:      74255:d2b4150c1885
parent:      74257:c39fbb24b3f4
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Jan 03 16:30:47 2012 -0600
summary:
  merge 3.2

files:
  Doc/reference/compound_stmts.rst |  5 +++--
  1 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/Doc/reference/compound_stmts.rst b/Doc/reference/compound_stmts.rst
--- a/Doc/reference/compound_stmts.rst
+++ b/Doc/reference/compound_stmts.rst
@@ -310,8 +310,9 @@
 is executed.  If there is a saved exception, it is re-raised at the end of the
 :keyword:`finally` clause. If the :keyword:`finally` clause raises another
 exception or executes a :keyword:`return` or :keyword:`break` statement, the
-saved exception is lost.  The exception information is not available to the
-program during execution of the :keyword:`finally` clause.
+saved exception is set as the context of the new exception.  The exception
+information is not available to the program during execution of the
+:keyword:`finally` clause.
 
 .. index::
    statement: return

-- 
Repository URL: http://hg.python.org/cpython