[Python-checkins] (no subject)
Stéphane Wirtel
webhook-mailer at python.org
Thu Sep 26 05:15:27 EDT 2019
To: python-checkins at python.org
Subject: bpo-38130: Fix error in explaining when an exception is re-raised
(GH-16016) (GH-16416)
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
https://github.com/python/cpython/commit/5017a645b0be53c4f399ae39ac897539e841=
6ca6
commit: 5017a645b0be53c4f399ae39ac897539e8416ca6
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.co=
m>
committer: St=C3=A9phane Wirtel <stephane at wirtel.be>
date: 2019-09-26T11:15:21+02:00
summary:
bpo-38130: Fix error in explaining when an exception is re-raised (GH-16016) =
(GH-16416)
Co-Authored-By: Ashwin Ramaswami <aramaswamis at gmail.com>
(cherry picked from commit 1ad7be2f16cc9955f271f57a5089602bb41eee85)
Co-authored-by: Mohammad Dehghan <md.unicorn at gmail.com>
files:
M Doc/tutorial/errors.rst
diff --git a/Doc/tutorial/errors.rst b/Doc/tutorial/errors.rst
index 9585f0673aec..4bc7184d1078 100644
--- a/Doc/tutorial/errors.rst
+++ b/Doc/tutorial/errors.rst
@@ -343,7 +343,7 @@ example::
=20
If a :keyword:`finally` clause is present, the :keyword:`finally` clause wil=
l execute as the last task before the :keyword:`try` statement completes. The=
:keyword:`finally` clause runs whether or not the :keyword:`try` statement p=
roduces an exception. The following points discuss more complex cases when an=
exception occurs:
=20
-* If an exception occurs during execution of the :keyword:`!try` clause, the=
exception may be handled by an :keyword:`except` clause. In all cases, the e=
xception is re-raised after the :keyword:`!finally` clause has been executed.
+* If an exception occurs during execution of the :keyword:`!try` clause, the=
exception may be handled by an :keyword:`except` clause. If the exception is=
not handled by an :keyword:`except` clause, the exception is re-raised after=
the :keyword:`!finally` clause has been executed.
=20
* An exception could occur during execution of an :keyword:`!except` or :key=
word:`!else` clause. Again, the exception is re-raised after the :keyword:`!f=
inally` clause has been executed.
=20
More information about the Python-checkins
mailing list