Merged revisions 61952-61953 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r61952 | mark.dickinson | 2008-03-26 22:41:36 +0100 (Wed, 26 Mar 2008) | 2 lines
Typo: "objects reference count" -> "object's reference count"
........
r61953 | christian.heimes | 2008-03-26 23:01:37 +0100 (Wed, 26 Mar 2008) | 4 lines
Patch #2477: Added from __future__ import unicode_literals
The new PyParser_*Ex() functions are based on Neal's suggestion and initial patch. The new __future__ feature makes all '' and r'' unicode strings. b'' and br'' stay (byte) strings.
........
diff --git a/Python/import.c b/Python/import.c
index d201dae..33cb81c 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -821,12 +821,13 @@
{
PyCodeObject *co = NULL;
mod_ty mod;
+ PyCompilerFlags flags;
PyArena *arena = PyArena_New();
if (arena == NULL)
return NULL;
mod = PyParser_ASTFromFile(fp, pathname, NULL,
- Py_file_input, 0, 0, 0,
+ Py_file_input, 0, 0, &flags,
NULL, arena);
if (mod) {
co = PyAST_Compile(mod, pathname, NULL, arena);