diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-09-02 18:38:15 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-09-02 18:38:15 (GMT) |
| commit | e9f72dbf0d857d166626f7fc2713c07a67db1643 (patch) | |
| tree | 83d7bac7f53f09bbd7d20b6516224aa7d71e4bf6 /Python/ast.c | |
| parent | f2f2bfee8af22385300b9dca1d10d1f26bc47034 (diff) | |
| parent | c5d7518a2eb139172f324a3c6a1ea78ee312b1a5 (diff) | |
| download | cpython-e9f72dbf0d857d166626f7fc2713c07a67db1643.zip cpython-e9f72dbf0d857d166626f7fc2713c07a67db1643.tar.gz cpython-e9f72dbf0d857d166626f7fc2713c07a67db1643.tar.bz2 | |
merge 3.2
Diffstat (limited to 'Python/ast.c')
| -rw-r--r-- | Python/ast.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Python/ast.c b/Python/ast.c index 5366dda..c78b81e 100644 --- a/Python/ast.c +++ b/Python/ast.c @@ -585,7 +585,7 @@ new_identifier(const char* n, struct compiling *c) static int ast_error(const node *n, const char *errstr) { - PyObject *u = Py_BuildValue("zii", errstr, LINENO(n), n->n_col_offset); + PyObject *u = Py_BuildValue("zii", errstr, LINENO(n), n->n_col_offset), *save; if (!u) return 0; /* @@ -593,7 +593,7 @@ ast_error(const node *n, const char *errstr) * exception in order to chain it. ast_error_finish, however, requires the * error not to be normalized. */ - PyObject *save = PyThreadState_GET()->exc_value; + save = PyThreadState_GET()->exc_value; PyThreadState_GET()->exc_value = NULL; PyErr_SetObject(PyExc_SyntaxError, u); PyThreadState_GET()->exc_value = save; |