diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-01-03 22:30:47 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-01-03 22:30:47 (GMT) |
| commit | 199808b796f0b8964796c7279d8e7f11f4b7480b (patch) | |
| tree | 152cb525c7f2a6f899a9d67fb2d3748612e0ee71 /Doc | |
| parent | c095956ca58b25fe2a4929de538e2eaf1a609852 (diff) | |
| parent | d204934ee368fe4828695b1a9b68b5020dac417a (diff) | |
| download | cpython-199808b796f0b8964796c7279d8e7f11f4b7480b.zip cpython-199808b796f0b8964796c7279d8e7f11f4b7480b.tar.gz cpython-199808b796f0b8964796c7279d8e7f11f4b7480b.tar.bz2 | |
merge 3.2
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/reference/compound_stmts.rst | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Doc/reference/compound_stmts.rst b/Doc/reference/compound_stmts.rst index 1f036d2..aea08e0 100644 --- a/Doc/reference/compound_stmts.rst +++ b/Doc/reference/compound_stmts.rst @@ -310,8 +310,9 @@ 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 lost. The exception information is not available to the -program during execution of the :keyword:`finally` clause. +saved exception is set as the context of the new exception. The exception +information is not available to the program during execution of the +:keyword:`finally` clause. .. index:: statement: return |