#11669: merge with 3.2.

2df05499 · Ezio Melotti · 90037609 · fc3db8a9 · 2df05499
Commit 2df05499 authored Jun 26, 2011 by Ezio Melotti
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

Doc/reference/compound_stmts.rst Doc/reference/compound_stmts.rst +3 -2

No files found.
--- a/Doc/reference/compound_stmts.rst
+++ b/Doc/reference/compound_stmts.rst
@@ -615,8 +615,9 @@ can be used to create instance variables with different implementation details.
 .. rubric:: Footnotes
-.. [#] The exception is propagated to the invocation stack only if there is no
+.. [#] The exception is propagated to the invocation stack unless
-   :keyword:`finally` clause that negates the exception.
+   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