jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correct PyErr_Fetch/PyErr_Restore variable names

Browse source
This commit is contained in:
William S Fulton 2018-08-07 08:54:40 +01:00
commit e0b23969d0
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/python/builtin.swg
View file

@ -436,15 +436,15 @@ SwigPyBuiltin_destructor_closure(SwigPyWrapperFunction wrapper, const char *wrap
Py_XDECREF(sobj->dict); Py_XDECREF(sobj->dict);
if (sobj->own) { if (sobj->own) {
PyObject *o; PyObject *o;
PyObject *val = 0, *type = 0, *tb = 0; PyObject *type = 0, *value = 0, *traceback = 0;
PyErr_Fetch(&val, &type, &tb); PyErr_Fetch(&type, &value, &traceback);
o = wrapper(a, NULL); o = wrapper(a, NULL);
if (!o) { if (!o) {
PyObject *deallocname = PyString_FromString(wrappername); PyObject *deallocname = PyString_FromString(wrappername);
PyErr_WriteUnraisable(deallocname); PyErr_WriteUnraisable(deallocname);
Py_DECREF(deallocname); Py_DECREF(deallocname);
} }
PyErr_Restore(val, type, tb); PyErr_Restore(type, value, traceback);
Py_XDECREF(o); Py_XDECREF(o);
} }
if (PyType_IS_GC(a->ob_type)) { if (PyType_IS_GC(a->ob_type)) {

6
Lib/python/pyrun.swg
View file

@ -530,8 +530,8 @@ SwigPyObject_dealloc(PyObject *v)
remain true upon return from SwigPyObject_dealloc. So save remain true upon return from SwigPyObject_dealloc. So save
and restore. */ and restore. */
PyObject *val = NULL, *type = NULL, *tb = NULL; PyObject *type = NULL, *value = NULL, *traceback = NULL;
PyErr_Fetch(&val, &type, &tb); PyErr_Fetch(&type, &value, &traceback);
if (data->delargs) { if (data->delargs) {
/* we need to create a temporary object to carry the destroy operation */ /* we need to create a temporary object to carry the destroy operation */
@ -546,7 +546,7 @@ SwigPyObject_dealloc(PyObject *v)
if (!res) if (!res)
PyErr_WriteUnraisable(destroy); PyErr_WriteUnraisable(destroy);
PyErr_Restore(val, type, tb); PyErr_Restore(type, value, traceback);
Py_XDECREF(res); Py_XDECREF(res);
} }