summaryrefslogtreecommitdiffstats
path: root/Doc/reference
diff options
context:
space:
mode:
authorMark Dickinson <mdickinson@enthought.com>2012-09-24 19:17:17 (GMT)
committerMark Dickinson <mdickinson@enthought.com>2012-09-24 19:17:17 (GMT)
commit33d8ce1f0f9f8151abadec10c37d439aa17b29ef (patch)
treef1cf623db914829b34559969b05bfd677fda9778 /Doc/reference
parentf8a2865482088b10f3230ece00421bad6e2337f2 (diff)
parent05ee5817a1d87c85d3377a436792889af21e8972 (diff)
downloadcpython-33d8ce1f0f9f8151abadec10c37d439aa17b29ef.zip
cpython-33d8ce1f0f9f8151abadec10c37d439aa17b29ef.tar.gz
cpython-33d8ce1f0f9f8151abadec10c37d439aa17b29ef.tar.bz2
Issue #14167: merge fix from 3.2 branch.
Diffstat (limited to 'Doc/reference')
-rw-r--r--Doc/reference/compound_stmts.rst10
1 files changed, 5 insertions, 5 deletions
diff --git a/Doc/reference/compound_stmts.rst b/Doc/reference/compound_stmts.rst
index 687ba3e..003224b 100644
--- a/Doc/reference/compound_stmts.rst
+++ b/Doc/reference/compound_stmts.rst
@@ -307,11 +307,11 @@ If :keyword:`finally` is present, it specifies a 'cleanup' handler. The
:keyword:`try` clause is executed, including any :keyword:`except` and
:keyword:`else` clauses. If an exception occurs in any of the clauses and is
not handled, the exception is temporarily saved. The :keyword:`finally` clause
-is executed. If there is a saved exception or :keyword:`break` statement,
-it is re-raised at the end of the :keyword:`finally` clause. If the
-:keyword:`finally` clause raises another exception the saved exception
-is set as the context of the new exception; if the :keyword:`finally` clause
-executes a :keyword:`return` statement, the saved exception is discarded::
+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, the saved exception is set as the context of the new exception.
+If the :keyword:`finally` clause executes a :keyword:`return` or :keyword:`break`
+statement, the saved exception is discarded::
def f():
try: