From 763557eac06ba60d7c5133e4f80df8870d8f917e Mon Sep 17 00:00:00 2001
From: csabella <chekat2@gmail.com>
Date: Sat, 20 May 2017 02:48:28 -0400
Subject: [PATCH] bpo-17188: DOC: Document 'from None' in raise statement
 (#1671)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Original patch by Dennis MÃ¥rtensson.
---
 Doc/reference/simple_stmts.rst | 22 ++++++++++++++++++++--
 Misc/ACKS                      |  1 +
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/Doc/reference/simple_stmts.rst b/Doc/reference/simple_stmts.rst
index 63d0ea5e77..2429f11fd1 100644
--- a/Doc/reference/simple_stmts.rst
+++ b/Doc/reference/simple_stmts.rst
@@ -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:
 
diff --git a/Misc/ACKS b/Misc/ACKS
index 246a50be00..d00fa79c60 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -965,6 +965,7 @@ David Marek
 Doug Marien
 Sven Marnach
 Alex Martelli
+Dennis MÃ¥rtensson
 Anthony Martin
 Owen Martin
 Sidney San Martín
-- 
2.40.0