summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2021-04-11 08:53:16 (GMT)
committerGitHub <noreply@github.com>2021-04-11 08:53:16 (GMT)
commit328d66c0715341f17343281c7b3d3032684e3c0a (patch)
tree4fab55006393e754814a5adba24c2a3dc85fbc10
parent3a3c0464bd719a8cac6e52b02a3479b2834b88a4 (diff)
downloadcpython-328d66c0715341f17343281c7b3d3032684e3c0a.zip
cpython-328d66c0715341f17343281c7b3d3032684e3c0a.tar.gz
cpython-328d66c0715341f17343281c7b3d3032684e3c0a.tar.bz2
Fix description of behaviour of an exception class in 'from' clause (GH-24303) (GH-25342)
(cherry picked from commit 79650d0118b0a8861428b9dd063089de405cf137) Co-authored-by: Mark Dickinson <mdickinson@enthought.com> Co-authored-by: Mark Dickinson <mdickinson@enthought.com>
-rw-r--r--Doc/reference/simple_stmts.rst11
1 files changed, 7 insertions, 4 deletions
diff --git a/Doc/reference/simple_stmts.rst b/Doc/reference/simple_stmts.rst
index f8ab2e9..8691cbd 100644
--- a/Doc/reference/simple_stmts.rst
+++ b/Doc/reference/simple_stmts.rst
@@ -591,10 +591,13 @@ instance, with its traceback set to its argument), like so::
__context__ (exception attribute)
The ``from`` clause is used for exception chaining: if given, the second
-*expression* must be another exception class or instance, which will then be
-attached to the raised exception as the :attr:`__cause__` attribute (which is
-writable). If the raised exception is not handled, both exceptions will be
-printed::
+*expression* must be another exception class or instance. If the second
+expression is an exception instance, it will be attached to the raised
+exception as the :attr:`__cause__` attribute (which is writable). If the
+expression is an exception class, the class will be instantiated and the
+resulting exception instance will be attached to the raised exception as the
+:attr:`__cause__` attribute. If the raised exception is not handled, both
+exceptions will be printed::
>>> try:
... print(1 / 0)