diff Python/ast.c @ 78839:f96df022f124

merge 3.2
author Benjamin Peterson <benjamin@python.org>
date Sun, 02 Sep 2012 14:38:15 -0400
parents d61424122af5 a5e28f9924c3
children 58de275e9224
line wrap: on
line diff
--- a/Python/ast.c	Sun Sep 02 14:25:18 2012 -0400
+++ b/Python/ast.c	Sun Sep 02 14:38:15 2012 -0400
@@ -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;