[Python-checkins] bpo-42589: Change URL for 'from' link when used in a raised exception (GH-23872)

Thu Apr 29 14:26:34 EDT 2021

https://github.com/python/cpython/commit/3eaa6f9d185f2a2c66d98a77d3ea3f407bc96d0e
commit: 3eaa6f9d185f2a2c66d98a77d3ea3f407bc96d0e
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021年04月29日T11:26:26-07:00
summary:
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 <sblondon at users.noreply.github.com>
files:
M Doc/library/exceptions.rst
M Doc/tutorial/errors.rst

diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst
index 28d1ab150c8706..7170b2c2b754f8 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<raise>` 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<raise>` 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 efe44da3043c5e..f72da5c3404484 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<raise>` which enables
 chaining exceptions. For example::
 
 # exc must be exception instance or None.
