diff options
author | Christian Heimes <christian@cheimes.de> | 2008-03-26 23:24:27 (GMT) |
---|---|---|
committer | Christian Heimes <christian@cheimes.de> | 2008-03-26 23:24:27 (GMT) |
commit | b1b3efc5049472829f586a57aa248afc131759cf (patch) | |
tree | 61f981bc0d4a0a2fafe59b23c7a92481ed1fda1f /Python/import.c | |
parent | 4d6ec85a022d05f11966004edc36151ab26bb13a (diff) | |
download | cpython-b1b3efc5049472829f586a57aa248afc131759cf.zip cpython-b1b3efc5049472829f586a57aa248afc131759cf.tar.gz cpython-b1b3efc5049472829f586a57aa248afc131759cf.tar.bz2 |
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
........
Diffstat (limited to 'Python/import.c')
-rw-r--r-- | Python/import.c | 1 |
1 files changed, 1 insertions, 0 deletions
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); |