[Python-checkins] cpython (merge 3.2 -> default): merge 3.2

Sun Sep 2 20:38:21 CEST 2012

http://hg.python.org/cpython/rev/f96df022f124
changeset: 78839:f96df022f124
parent: 78837:a2294412d214
parent: 78838:a5e28f9924c3
user: Benjamin Peterson <benjamin at python.org>
date: Sun Sep 02 14:38:15 2012 -0400
summary:
 merge 3.2
files:
 Python/ast.c | 4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Python/ast.c b/Python/ast.c
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -585,7 +585,7 @@
 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 @@
 * 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;
-- 
Repository URL: http://hg.python.org/cpython
