diff options
| author | Christian Heimes <christian@cheimes.de> | 2008-03-26 22:34:47 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2008-03-26 22:34:47 (GMT) |
| commit | 4d6ec85a022d05f11966004edc36151ab26bb13a (patch) | |
| tree | acab0f1f76a8789a060d1a9c7a723152d69fde8a /Python/pythonrun.c | |
| parent | 9edef04c956c36aaa3ccc3eaef2d99f233153297 (diff) | |
| download | cpython-4d6ec85a022d05f11966004edc36151ab26bb13a.zip cpython-4d6ec85a022d05f11966004edc36151ab26bb13a.tar.gz cpython-4d6ec85a022d05f11966004edc36151ab26bb13a.tar.bz2 | |
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.
........
Diffstat (limited to 'Python/pythonrun.c')
| -rw-r--r-- | Python/pythonrun.c | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c index d65d12d..5c17b69 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -1563,11 +1563,12 @@ Py_SymtableString(const char *str, const char *filename, int start) { struct symtable *st; mod_ty mod; + PyCompilerFlags flags; PyArena *arena = PyArena_New(); if (arena == NULL) return NULL; - mod = PyParser_ASTFromString(str, filename, start, NULL, arena); + mod = PyParser_ASTFromString(str, filename, start, &flags, arena); if (mod == NULL) { PyArena_Free(arena); return NULL; @@ -1584,10 +1585,16 @@ PyParser_ASTFromString(const char *s, const char *filename, int start, { mod_ty mod; perrdetail err; - node *n = PyParser_ParseStringFlagsFilename(s, filename, + int iflags; + iflags = PARSER_FLAGS(flags); + + node *n = PyParser_ParseStringFlagsFilenameEx(s, filename, &_PyParser_Grammar, start, &err, - PARSER_FLAGS(flags)); + &iflags); if (n) { + if (flags) { + flags->cf_flags |= iflags & PyCF_MASK; + } mod = PyAST_FromNode(n, flags, filename, arena); PyNode_Free(n); return mod; @@ -1606,10 +1613,16 @@ PyParser_ASTFromFile(FILE *fp, const char *filename, const char* enc, { mod_ty mod; perrdetail err; - node *n = PyParser_ParseFileFlags(fp, filename, enc, + int iflags; + + iflags = PARSER_FLAGS(flags); + node *n = PyParser_ParseFileFlagsEx(fp, filename, enc, &_PyParser_Grammar, - start, ps1, ps2, &err, PARSER_FLAGS(flags)); + start, ps1, ps2, &err, &iflags); if (n) { + if (flags) { + flags->cf_flags |= iflags & PyCF_MASK; + } mod = PyAST_FromNode(n, flags, filename, arena); PyNode_Free(n); return mod; |