[Python-checkins] cpython (merge 3.2 -> default): Issue #14167: merge fix from 3.2 branch.

Mon Sep 24 21:17:35 CEST 2012

http://hg.python.org/cpython/rev/f5ed3a5440b2
changeset: 79150:f5ed3a5440b2
parent: 79148:62ddf16eea24
parent: 79149:485902ecf0ee
user: Mark Dickinson <mdickinson at enthought.com>
date: Mon Sep 24 20:17:17 2012 +0100
summary:
 Issue #14167: merge fix from 3.2 branch.
files:
 Doc/reference/compound_stmts.rst | 10 +++++-----
 1 files changed, 5 insertions(+), 5 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
@@ -307,11 +307,11 @@
 :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:
-- 
Repository URL: http://hg.python.org/cpython
