bpo-17188: DOC: Document 'from None' in raise statement (GH-1671) (GH-1867)

Original patch by Dennis Mårtensson.
(cherry picked from commit 763557eac0)
This commit is contained in:
csabella 2017-05-30 16:27:39 -04:00 committed by Mariatta
parent 03c7600982
commit 00b381b9a7
2 changed files with 21 additions and 2 deletions

View file

@ -587,7 +587,7 @@ printed::
...
Traceback (most recent call last):
File "<stdin>", line 2, in <module>
ZeroDivisionError: int division or modulo by zero
ZeroDivisionError: division by zero
The above exception was the direct cause of the following exception:
@ -606,7 +606,7 @@ attached as the new exception's :attr:`__context__` attribute::
...
Traceback (most recent call last):
File "<stdin>", line 2, in <module>
ZeroDivisionError: int division or modulo by zero
ZeroDivisionError: division by zero
During handling of the above exception, another exception occurred:
@ -614,9 +614,27 @@ attached as the new exception's :attr:`__context__` attribute::
File "<stdin>", line 4, in <module>
RuntimeError: Something bad happened
Exception chaining can be explicitly suppressed by specifying :const:`None` in
the ``from`` clause::
>>> try:
... print(1 / 0)
... except:
... raise RuntimeError("Something bad happened") from None
...
Traceback (most recent call last):
File "<stdin>", line 4, in <module>
RuntimeError: Something bad happened
Additional information on exceptions can be found in section :ref:`exceptions`,
and information about handling exceptions is in section :ref:`try`.
.. versionchanged:: 3.3
:const:`None` is now permitted as ``Y`` in ``raise X from Y``
.. versionadded:: 3.3
The ``__suppress_context__`` attribute to suppress automatic display of the
exception context
.. _break:

View file

@ -963,6 +963,7 @@ David Marek
Doug Marien
Sven Marnach
Alex Martelli
Dennis Mårtensson
Anthony Martin
Owen Martin
Sidney San Martín