From 3eaa6f9d185f2a2c66d98a77d3ea3f407bc96d0e Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Thu, 29 Apr 2021 11:26:26 -0700 Subject: bpo-42589: Change URL for 'from' link when used in a raised exception (GH-23872) Links for 'raise Exception from x' target to 'The raise statement' (7.8) section instead of 'The import statement' (7.11) section. There are more modified links than in the bug report because I searched some other ones which can get the same improvement. (cherry picked from commit 2fd928c8c1328424130cb9c51fc02ad5f9a66328) Co-authored-by: sblondon --- Doc/library/exceptions.rst | 4 ++-- Doc/tutorial/errors.rst | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst index 28d1ab1..7170b2c 100644 --- a/Doc/library/exceptions.rst +++ b/Doc/library/exceptions.rst @@ -42,12 +42,12 @@ include the originating exception(s) and the final exception. When raising a new exception (rather than using a bare ``raise`` to re-raise the exception currently being handled), the implicit exception context can be -supplemented with an explicit cause by using :keyword:`from` with +supplemented with an explicit cause by using :keyword:`from` with :keyword:`raise`:: raise new_exc from original_exc -The expression following :keyword:`from` must be an exception or ``None``. It +The expression following :keyword:`from` must be an exception or ``None``. It will be set as :attr:`__cause__` on the raised exception. Setting :attr:`__cause__` also implicitly sets the :attr:`__suppress_context__` attribute to ``True``, so that using ``raise new_exc from None`` diff --git a/Doc/tutorial/errors.rst b/Doc/tutorial/errors.rst index efe44da..f72da5c 100644 --- a/Doc/tutorial/errors.rst +++ b/Doc/tutorial/errors.rst @@ -272,7 +272,7 @@ re-raise the exception:: Exception Chaining ================== -The :keyword:`raise` statement allows an optional :keyword:`from` which enables +The :keyword:`raise` statement allows an optional :keyword:`from` which enables chaining exceptions. For example:: # exc must be exception instance or None. -- cgit v0.12