commit b1b3efc5049472829f586a57aa248afc131759cf
author Christian Heimes <christian@cheimes.de> Wed Mar 26 23:24:27 2008 +0000
committer Christian Heimes <christian@cheimes.de> Wed Mar 26 23:24:27 2008 +0000
tree 61f981bc0d4a0a2fafe59b23c7a92481ed1fda1f
parent 4d6ec85a022d05f11966004edc36151ab26bb13a

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
........

Python/pythonrun.c

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 5c17b69..08091b7 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -1568,6 +1568,7 @@
 	if (arena == NULL)
 		return NULL;
 
+	flags.cf_flags = 0;
 	mod = PyParser_ASTFromString(str, filename, start, &flags, arena);
 	if (mod == NULL) {
 		PyArena_Free(arena);