Merged revisions 61954,61956-61957 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r61954 | christian.heimes | 2008-03-26 23:20:26 +0100 (Wed, 26 Mar 2008) | 1 line Surround p_flags access with #ifdef PY_PARSER_REQUIRES_FUTURE_KEYWORD ........ r61956 | christian.heimes | 2008-03-26 23:51:58 +0100 (Wed, 26 Mar 2008) | 1 line Initialize PyCompilerFlags cf_flags with 0 ........ r61957 | christian.heimes | 2008-03-26 23:55:31 +0100 (Wed, 26 Mar 2008) | 1 line I forgot to svn add the future test ........

--- a/Python/import.c	Wed Mar 26 22:34:47 2008 +0000
+++ b/Python/import.c	Wed Mar 26 23:24:27 2008 +0000
@@ -826,6 +826,7 @@
 	if (arena == NULL)
 		return NULL;
 
+	flags.cf_flags = 0;
 	mod = PyParser_ASTFromFile(fp, pathname, NULL,
 				   Py_file_input, 0, 0, &flags, 
 				   NULL, arena);