summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Lib/test/test_future4.py11
-rw-r--r--Parser/parsetok.c1
-rw-r--r--Python/import.c1
-rw-r--r--Python/pythonrun.c1
4 files changed, 14 insertions, 0 deletions
diff --git a/Lib/test/test_future4.py b/Lib/test/test_future4.py
new file mode 100644
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 873be97..c6be8f9 100644
--- 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 33cb81c..5b96cea 100644
--- 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 5c17b69..08091b7 100644
--- 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);