mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

bpo-31091: Remove dead code in PyErr_GivenExceptionMatches(). (#2963)

Browse source 
According to the comment, there was previously a call to PyObject_IsSubclass() involved which could fail, but since it was replaced with a call to PyType_IsSubtype(), it can no longer fail.
This commit is contained in:
scoder 2017-07-31 22:27:46 +02:00 • committed by Serhiy Storchaka
parent 8474d87165
commit e4c06bcca3
1 changed files with 1 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Python/errors.c
View file

@ -191,19 +191,7 @@ PyErr_GivenExceptionMatches(PyObject *err, PyObject *exc)
err = PyExceptionInstance_Class(err); err = PyExceptionInstance_Class(err);
if (PyExceptionClass_Check(err) && PyExceptionClass_Check(exc)) { if (PyExceptionClass_Check(err) && PyExceptionClass_Check(exc)) {
int res = 0; return PyType_IsSubtype((PyTypeObject *)err, (PyTypeObject *)exc);
PyObject *exception, *value, *tb;
PyErr_Fetch(&exception, &value, &tb);
/* PyObject_IsSubclass() can recurse and therefore is
not safe (see test_bad_getattr in test.pickletester). */
res = PyType_IsSubtype((PyTypeObject *)err, (PyTypeObject *)exc);
/* This function must not fail, so print the error here */
if (res == -1) {
PyErr_WriteUnraisable(err);
res = 0;
}
PyErr_Restore(exception, value, tb);
return res;
} }
return err == exc; return err == exc;