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 /Parser/parser.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 'Parser/parser.c')
| -rw-r--r-- | Parser/parser.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/Parser/parser.c b/Parser/parser.c index 134e14c..9e115df 100644 --- a/Parser/parser.c +++ b/Parser/parser.c @@ -206,10 +206,18 @@ future_hack(parser_state *ps) for (i = 0; i < NCH(ch); i += 2) { cch = CHILD(ch, i); - if (NCH(cch) >= 1 && TYPE(CHILD(cch, 0)) == NAME && - strcmp(STR(CHILD(cch, 0)), "with_statement") == 0) { - ps->p_flags |= CO_FUTURE_WITH_STATEMENT; - break; + if (NCH(cch) >= 1 && TYPE(CHILD(cch, 0)) == NAME) { + char *str_ch = STR(CHILD(cch, 0)); + if (strcmp(str_ch, FUTURE_WITH_STATEMENT) == 0) { + ps->p_flags |= CO_FUTURE_WITH_STATEMENT; + break; + } else if (strcmp(str_ch, FUTURE_PRINT_FUNCTION) == 0) { + ps->p_flags |= CO_FUTURE_PRINT_FUNCTION; + break; + } else if (strcmp(str_ch, FUTURE_UNICODE_LITERALS) == 0) { + ps->p_flags |= CO_FUTURE_UNICODE_LITERALS; + break; + } } } } |