mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-10 04:45:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merged revisions 61952-61953 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Christian Heimes 2008-03-26 22:34:47 +00:00
parent 9edef04c95
commit 4d6ec85a02
11 changed files with 92 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Python/pythonrun.c
View file

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