summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-06-26 08:38:08 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2011-06-26 08:38:08 (GMT)
commit2df05499430d35f5cbad7ec46e0fa12d261d2ac3 (patch)
treecf6f2e05b41b835743e99516760d529e82e3d4b9
parent9003760991145584ec1f11d4eed3242dd4467c05 (diff)
parentfc3db8a91ec2aa61810dc73c61543e0431d3267e (diff)
downloadcpython-2df05499430d35f5cbad7ec46e0fa12d261d2ac3.zip
cpython-2df05499430d35f5cbad7ec46e0fa12d261d2ac3.tar.gz
cpython-2df05499430d35f5cbad7ec46e0fa12d261d2ac3.tar.bz2
#11669: merge with 3.2.
-rw-r--r--Doc/reference/compound_stmts.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/Doc/reference/compound_stmts.rst b/Doc/reference/compound_stmts.rst
index d261574..8151a0a 100644
--- 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
- :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