Skip to content

Commit

Permalink
bpo-17188: DOC: Document 'from None' in raise statement (#1671)
Browse files Browse the repository at this point in the history
Original patch by Dennis Mårtensson.
  • Loading branch information
csabella authored and terryjreedy committed May 20, 2017
1 parent d896985 commit 763557e
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 2 deletions.
22 changes: 20 additions & 2 deletions Doc/reference/simple_stmts.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand All @@ -606,17 +606,35 @@ 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:

Traceback (most recent call last):
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:

Expand Down
1 change: 1 addition & 0 deletions Misc/ACKS
Original file line number Diff line number Diff line change
Expand Up @@ -965,6 +965,7 @@ David Marek
Doug Marien
Sven Marnach
Alex Martelli
Dennis Mårtensson
Anthony Martin
Owen Martin
Sidney San Martín
Expand Down

0 comments on commit 763557e

Please sign in to comment.