From a10d3afed2f27504768dffd3a915a7c876258505 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 24 Sep 2006 12:35:36 +0000 Subject: Fix a bug in the parser's future statement handling that led to "with" not being recognized as a keyword after, e.g., this statement: from __future__ import division, with_statement --- Lib/test/test_future.py | 21 +++++++++++++++++++++ Misc/NEWS | 4 ++++ Parser/parser.c | 22 ++++++++++++---------- 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/Lib/test/test_future.py b/Lib/test/test_future.py index f5462e20..ec60489 100644 --- a/Lib/test/test_future.py +++ b/Lib/test/test_future.py @@ -82,6 +82,27 @@ class FutureTest(unittest.TestCase): else: self.fail("expected exception didn't occur") + def test_parserhack(self): + # test that the parser.c::future_hack function works as expected + # Note: although this test must pass, it's not testing the original + # bug as of 2.6 since the with statement is not optional and + # the parser hack disabled. If a new keyword is introduced in + # 2.6, change this to refer to the new future import. + try: + exec "from __future__ import division, with_statement; with = 0" + except SyntaxError: + pass + else: + self.fail("syntax error didn't occur") + + try: + exec "from __future__ import (with_statement, division); with = 0" + except SyntaxError: + pass + else: + self.fail("syntax error didn't occur") + + def test_main(): test_support.run_unittest(FutureTest) diff --git a/Misc/NEWS b/Misc/NEWS index 891c785..ae14e8f 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -12,6 +12,10 @@ What's New in Python 2.6 alpha 1? Core and builtins ----------------- +- Fix a bug in the parser's future statement handling that led to "with" + not being recognized as a keyword after, e.g., this statement: + from __future__ import division, with_statement + - Bug #1557232: fix seg fault with def f((((x)))) and def f(((x),)). - Fix %zd string formatting on Mac OS X so it prints negative numbers. diff --git a/Parser/parser.c b/Parser/parser.c index 04d5817..2ce84cd 100644 --- a/Parser/parser.c +++ b/Parser/parser.c @@ -181,7 +181,7 @@ static void future_hack(parser_state *ps) { node *n = ps->p_stack.s_top->s_parent; - node *ch; + node *ch, *cch; int i; /* from __future__ import ..., must have at least 4 children */ @@ -195,15 +195,17 @@ future_hack(parser_state *ps) if (NCH(ch) == 1 && STR(CHILD(ch, 0)) && strcmp(STR(CHILD(ch, 0)), "__future__") != 0) return; - for (i = 3; i < NCH(n); i += 2) { - /* XXX: assume we don't have parentheses in import: - from __future__ import (x, y, z) - */ - ch = CHILD(n, i); - if (NCH(ch) == 1) - ch = CHILD(ch, 0); - if (NCH(ch) >= 1 && TYPE(CHILD(ch, 0)) == NAME && - strcmp(STR(CHILD(ch, 0)), "with_statement") == 0) { + ch = CHILD(n, 3); + /* ch can be a star, a parenthesis or import_as_names */ + if (TYPE(ch) == STAR) + return; + if (TYPE(ch) == LPAR) + ch = CHILD(n, 4); + + 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; } -- cgit v0.12