mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 19:54:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge 3.2 (#15846)

Browse source
This commit is contained in:
Benjamin Peterson 2012-09-02 14:24:44 -04:00
commit c7f447c89f
3 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Python/ast.c
View file

@ -588,7 +588,15 @@ ast_error(const node *n, const char *errstr)
PyObject *u = Py_BuildValue("zii", errstr, LINENO(n), n->n_col_offset);
if (!u)
return 0;
/*
* Prevent the error from being chained. PyErr_SetObject will normalize the
* exception in order to chain it. ast_error_finish, however, requires the
* error not to be normalized.
*/
PyObject *save = PyThreadState_GET()->exc_value;
PyThreadState_GET()->exc_value = NULL;
PyErr_SetObject(PyExc_SyntaxError, u);
PyThreadState_GET()->exc_value = save;
Py_DECREF(u);
return 0;
}