diff Python/bltinmodule.c @ 57674:2b934d466993 2.6

Merged revisions 76774 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r76774 | benjamin.peterson | 2009-12-12 18:54:15 -0600 (Sat, 12 Dec 2009) | 1 line account for PyObject_IsInstance's new ability to fail ........
author Benjamin Peterson <benjamin@python.org>
date Sun, 13 Dec 2009 00:59:01 +0000
parents 2628216bc66d
children 35328f06921c
line wrap: on
line diff
--- a/Python/bltinmodule.c	Sat Dec 12 19:27:08 2009 +0000
+++ b/Python/bltinmodule.c	Sun Dec 13 00:59:01 2009 +0000
@@ -465,6 +465,7 @@
 	int mode = -1;
 	int dont_inherit = 0;
 	int supplied_flags = 0;
+	int is_ast;
 	PyCompilerFlags cf;
 	PyObject *result = NULL, *cmd, *tmp = NULL;
 	Py_ssize_t length;
@@ -504,7 +505,10 @@
 		return NULL;
 	}
 
-	if (PyAST_Check(cmd)) {
+	is_ast = PyAST_Check(cmd);
+	if (is_ast == -1)
+		return NULL;
+	if (is_ast) {
 		if (supplied_flags & PyCF_ONLY_AST) {
 			Py_INCREF(cmd);
 			result = cmd;