merge 3.2

benjaminp · benjaminp · commit e9f72dbf0d85 · 2012-09-02T14:38:15.000-04:00
diff --git a/Python/ast.c b/Python/ast.c
@@ -585,15 +585,15 @@ 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;
     /*
      * 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;
+    save = PyThreadState_GET()->exc_value;
     PyThreadState_GET()->exc_value = NULL;
     PyErr_SetObject(PyExc_SyntaxError, u);
     PyThreadState_GET()->exc_value = save;
