diff options
author | Benjamin Peterson <benjamin@python.org> | 2008-10-26 20:59:05 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2008-10-26 20:59:05 (GMT) |
commit | b74777ed333ce2d22494fd4c996e87d386d950c8 (patch) | |
tree | 5f59a0c96e3862a887dd6626dd374c7357dbcfda /Parser | |
parent | 23681daa712b42a0bd0b81efcb0ad8ca1a3ed368 (diff) | |
download | cpython-b74777ed333ce2d22494fd4c996e87d386d950c8.zip cpython-b74777ed333ce2d22494fd4c996e87d386d950c8.tar.gz cpython-b74777ed333ce2d22494fd4c996e87d386d950c8.tar.bz2 |
Merged revisions 67030-67031 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67030 | benjamin.peterson | 2008-10-26 15:21:13 -0500 (Sun, 26 Oct 2008) | 1 line
fix __future__ imports when multiple features are given
........
r67031 | benjamin.peterson | 2008-10-26 15:33:19 -0500 (Sun, 26 Oct 2008) | 1 line
add forgotten test for r67030
........
Diffstat (limited to 'Parser')
-rw-r--r-- | Parser/parser.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Parser/parser.c b/Parser/parser.c index 8d52153..e597ea2 100644 --- a/Parser/parser.c +++ b/Parser/parser.c @@ -206,13 +206,10 @@ future_hack(parser_state *ps) 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; } } } |