Fix ast_for_atom()

vstinner · vstinner · commit c35cb953ee35 · 2015-09-03T12:57:11.000+02:00
Clear PyObject_Str() exception if it failed, ast_error() should not be called
with an exception set.
diff --git a/Python/ast.c b/Python/ast.c
@@ -2040,6 +2040,7 @@ ast_for_atom(struct compiling *c, const node *n)
                     PyOS_snprintf(buf, sizeof(buf), "(%s) %s", errtype, s);
                     Py_DECREF(errstr);
                 } else {
+                    PyErr_Clear();
                     PyOS_snprintf(buf, sizeof(buf), "(%s) unknown error", errtype);
                 }
                 ast_error(c, n, buf);

Original file line number	Diff line number	Diff line change
`@@ -2040,6 +2040,7 @@ ast_for_atom(struct compiling c, const node n)`
`2040`	`2040`	`PyOS_snprintf(buf, sizeof(buf), "(%s) %s", errtype, s);`
`2041`	`2041`	`Py_DECREF(errstr);`
`2042`	`2042`	`} else {`
	`2043`	`+ PyErr_Clear();`
`2043`	`2044`	`PyOS_snprintf(buf, sizeof(buf), "(%s) unknown error", errtype);`
`2044`	`2045`	`}`
`2045`	`2046`	`ast_error(c, n, buf);`