diff options
| author | Georg Brandl <georg@python.org> | 2014-10-31 09:39:29 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-10-31 09:39:29 (GMT) |
| commit | e21a531ef10e120a94434b3d4806a8106dd6f271 (patch) | |
| tree | 0b1d0245388effa5cbf130744b50af6ab6a1eb5f /Doc/library/exceptions.rst | |
| parent | fe98180bced16be7d62b762cc85d400f929d0885 (diff) | |
| parent | a4c8c47961305487ef6c40a6d882bb956f2c5a0b (diff) | |
| download | cpython-e21a531ef10e120a94434b3d4806a8106dd6f271.zip cpython-e21a531ef10e120a94434b3d4806a8106dd6f271.tar.gz cpython-e21a531ef10e120a94434b3d4806a8106dd6f271.tar.bz2 | |
merge with 3.4
Diffstat (limited to 'Doc/library/exceptions.rst')
| -rw-r--r-- | Doc/library/exceptions.rst | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst index 74d6fcb..5892154 100644 --- a/Doc/library/exceptions.rst +++ b/Doc/library/exceptions.rst @@ -34,7 +34,8 @@ class or one of its subclasses, and not from :exc:`BaseException`. More information on defining exceptions is available in the Python Tutorial under :ref:`tut-userexceptions`. -When raising (or re-raising) an exception in an :keyword:`except` clause +When raising (or re-raising) an exception in an :keyword:`except` or +:keyword:`finally` clause :attr:`__context__` is automatically set to the last exception caught; if the new exception is not handled the traceback that is eventually displayed will include the originating exception(s) and the final exception. |