Revert "bpo-29587: Enable implicit exception chaining with gen.throw() (GH-19811...

This reverts commit 2514a632fb7d37be24c2059d0e286d35600f9795.

diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py
index 4d96f44b15062268b3485db69ca41ed16dfc6d79..3e42bc6b69a819c276dad3597bccfceb1f4e2bbe 100644 (file)
--- a/Lib/test/test_generators.py
+++ b/Lib/test/test_generators.py
@@ -316,23 +316,6 @@ class ExceptionTest(unittest.TestCase):
         self.assertEqual(cm.exception.value.value, 2)
 
 
-class GeneratorThrowTest(unittest.TestCase):
-
-    def test_exception_context_set(self):
-        def f():
-            try:
-                raise KeyError('a')
-            except Exception:
-                yield
-
-        gen = f()
-        gen.send(None)
-        with self.assertRaises(ValueError) as cm:
-            gen.throw(ValueError)
-        context = cm.exception.__context__
-        self.assertEqual((type(context), context.args), (KeyError, ('a',)))
-
-
 class YieldFromTests(unittest.TestCase):
     def test_generator_gi_yieldfrom(self):
         def a():

diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-04-30-00-50-25.bpo-29587.oEwSq.rst b/Misc/NEWS.d/next/Core and Builtins/2020-04-30-00-50-25.bpo-29587.oEwSq.rst
deleted file mode 100644 (file)
index f44aa36..0000000
--- a/Misc/NEWS.d/next/Core and Builtins/2020-04-30-00-50-25.bpo-29587.oEwSq.rst
+++ /dev/null
@@ -1 +0,0 @@
-Enable implicit exception chaining when calling :meth:`generator.throw`.

diff --git a/Objects/genobject.c b/Objects/genobject.c
index 289ed79aa28a652e715a74e739e37f595df8afa9..6e36690b65148ab1f31a9b6d8d9a70a805bae0bb 100644 (file)
--- a/Objects/genobject.c
+++ b/Objects/genobject.c
@@ -512,12 +512,6 @@ throw_here:
     }
 
     PyErr_Restore(typ, val, tb);
-    if (gen->gi_exc_state.exc_type) {
-        Py_INCREF(gen->gi_exc_state.exc_type);
-        Py_XINCREF(gen->gi_exc_state.exc_value);
-        Py_XINCREF(gen->gi_exc_state.exc_traceback);
-        _PyErr_ChainExceptions(gen->gi_exc_state.exc_type, gen->gi_exc_state.exc_value, gen->gi_exc_state.exc_traceback);
-    }
     return gen_send_ex(gen, Py_None, 1, 0);
 
 failed_throw: