mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-08 10:21:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

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

Browse source 
This reverts commit 2514a632fb.
This commit is contained in:
Victor Stinner 2020-04-30 22:44:24 +02:00 • committed by GitHub
parent 2514a632fb
commit 3c7f9db850
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Lib/test/test_generators.py
View file

@ -316,23 +316,6 @@ class ExceptionTest(unittest.TestCase):
self.assertEqual(cm.exception.value.value, 2) 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): class YieldFromTests(unittest.TestCase):
def test_generator_gi_yieldfrom(self): def test_generator_gi_yieldfrom(self):
def a(): def a():

1
Misc/NEWS.d/next/Core and Builtins/2020-04-30-00-50-25.bpo-29587.oEwSq.rst
View file

@ -1 +0,0 @@
Enable implicit exception chaining when calling :meth:`generator.throw`.

6
Objects/genobject.c
View file

@ -512,12 +512,6 @@ throw_here:
} }
PyErr_Restore(typ, val, tb); 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); return gen_send_ex(gen, Py_None, 1, 0);
failed_throw: failed_throw: