https://github.com/python/cpython/commit/3c7f9db85095952821f9d106dd874f75662... commit: 3c7f9db85095952821f9d106dd874f75662ce7ec branch: master author: Victor Stinner <vstinner@python.org> committer: GitHub <noreply@github.com> date: 2020-04-30T22:44:24+02:00 summary: Revert "bpo-29587: Enable implicit exception chaining with gen.throw() (GH-19811)" (#19821) This reverts commit 2514a632fb7d37be24c2059d0e286d35600f9795. files: D Misc/NEWS.d/next/Core and Builtins/2020-04-30-00-50-25.bpo-29587.oEwSq.rst M Lib/test/test_generators.py M Objects/genobject.c diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py index 4d96f44b15062..3e42bc6b69a81 100644 --- a/Lib/test/test_generators.py +++ b/Lib/test/test_generators.py @@ -316,23 +316,6 @@ def g(): 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 index f44aa360cc2ef..0000000000000 --- 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 289ed79aa28a6..6e36690b65148 100644 --- a/Objects/genobject.c +++ b/Objects/genobject.c @@ -512,12 +512,6 @@ _gen_throw(PyGenObject *gen, int close_on_genexit, } 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: