Merged revisions 61954,61956-61957 via svnmerge from

christian.heimes · christian.heimes · commit 16333ad9aa23 · 2008-03-26T23:24:27.000Z
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 ........ git-svn-id: http://svn.python.org/projects/python/branches/py3k@61960 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Lib/test/test_future4.py b/Lib/test/test_future4.py
@@ -0,0 +1,11 @@
+from __future__ import print_function
+from __future__ import unicode_literals
+
+import unittest
+from test import test_support
+
+def test_main():
+    pass
+
+if __name__ == "__main__":
+    test_main()
diff --git a/Parser/parsetok.c b/Parser/parsetok.c
@@ -225,6 +225,7 @@ parsetok(struct tok_state *tok, grammar *g, int start, perrdetail *err_ret,
 	}
 	else
 		n = NULL;
+
 #ifdef PY_PARSER_REQUIRES_FUTURE_KEYWORD
 	*flags = ps->p_flags;
 #endif
diff --git a/Python/import.c b/Python/import.c
@@ -826,6 +826,7 @@ parse_source_module(const char *pathname, FILE *fp)
 	if (arena == NULL)
 		return NULL;
 
+	flags.cf_flags = 0;
 	mod = PyParser_ASTFromFile(fp, pathname, NULL,
 				   Py_file_input, 0, 0, &flags, 
 				   NULL, arena);
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
@@ -1568,6 +1568,7 @@ Py_SymtableString(const char *str, const char *filename, int start)
 	if (arena == NULL)
 		return NULL;
 
+	flags.cf_flags = 0;
 	mod = PyParser_ASTFromString(str, filename, start, &flags, arena);
 	if (mod == NULL) {
 		PyArena_Free(arena);

Original file line number	Diff line number	Diff line change
`@@ -225,6 +225,7 @@ parsetok(struct tok_state tok, grammar g, int start, perrdetail *err_ret,`
`225`	`225`	`}`
`226`	`226`	`else`
`227`	`227`	`n = NULL;`
	`228`	`+`
`228`	`229`	`#ifdef PY_PARSER_REQUIRES_FUTURE_KEYWORD`
`229`	`230`	`*flags = ps->p_flags;`
`230`	`231`	`#endif`