[Python-checkins] cpython (merge 3.2 -> default): #11669: merge with 3.2.

[ezio.melotti]

http://hg.python.org/cpython/rev/a7099a3b5e5f
changeset:   70990:a7099a3b5e5f
parent:      70987:c5b0585624ef
parent:      70989:74e9f94d8440
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Jun 26 11:38:08 2011 +0300
summary:
  #11669: merge with 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
@@ -615,8 +615,9 @@
 
 .. rubric:: Footnotes
 
-.. [#] The exception is propagated to the invocation stack only if there is no
-   :keyword:`finally` clause that negates the exception.
+.. [#] The exception is propagated to the invocation stack unless
+   there is a :keyword:`finally` clause which happens to raise another
+   exception. That new exception causes the old one to be lost.
 
 .. [#] Currently, control "flows off the end" except in the case of an exception
    or the execution of a :keyword:`return`, :keyword:`continue`, or

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