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

diff --git a/Lib/test/test_future4.py b/Lib/test/test_future4.py
new file mode 100644 (file)
index 0000000..5456449
--- /dev/null
+++ 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
index 873be973ce6a4afbe5085163001685501e2f7fa2..c6be8f9f2c1e5cb7c440391facf158c9b3e6dfcc 100644 (file)
--- 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
index 33cb81c8dcdd8e4bf87aabb852a902d6a960ee9a..5b96cea545938fd061006b44017c01c14be5a66e 100644 (file)
--- 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
index 5c17b695783ba69730dc1909c32dbcb4ae6ddae7..08091b7939a698a9de093315df51b1bb7ec2ee0f 100644 (file)
--- 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);