traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
........
This commit is contained in:
Christian Heimes 2008-03-26 23:24:27 +00:00
parent 4d6ec85a02
commit b1b3efc504
4 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Lib/test/test_future4.py Normal file
View File

@ -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()

1
Parser/parsetok.c
View File

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

1
Python/import.c
View File

@ -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);

1
Python/pythonrun.c
View File

@ -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);