[Python-checkins] cpython (2.7): Issue #14167: restore statement about breaks in finally clauses; remove

mark.dickinson python-checkins at python.org
Mon Sep 24 21:25:46 CEST 2012


http://hg.python.org/cpython/rev/f51d11405f1d
changeset:   79151:f51d11405f1d
branch:      2.7
parent:      79146:ce943bce76c9
user:        Mark Dickinson <mdickinson at enthought.com>
date:        Mon Sep 24 20:25:24 2012 +0100
summary:
  Issue #14167: restore statement about breaks in finally clauses; remove statement about exception chaining.

files:
  Doc/reference/compound_stmts.rst |  18 ++++++++----------
  1 files changed, 8 insertions(+), 10 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
@@ -290,16 +290,14 @@
 
 .. index:: keyword: finally
 
-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::
+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, 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 dicarded::
 
     def f():
         try:

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


More information about the Python-checkins mailing list