From 4fac70683366ff65cdc3acf609246bf69c8ff61b Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Sat, 3 Oct 2009 20:28:47 +0000 Subject: Merged revisions 75224 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r75224 | benjamin.peterson | 2009-10-03 15:27:13 -0500 (Sat, 03 Oct 2009) | 9 lines Merged revisions 75223 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75223 | benjamin.peterson | 2009-10-03 15:23:24 -0500 (Sat, 03 Oct 2009) | 1 line #7050 fix a SystemError when using tuple unpacking and augmented assignment ........ ................ --- Lib/test/test_augassign.py | 3 +++ Python/ast.c | 13 +++++++++++++ 2 files changed, 16 insertions(+) diff --git a/Lib/test/test_augassign.py b/Lib/test/test_augassign.py index 8567821..e1b6e27 100644 --- a/Lib/test/test_augassign.py +++ b/Lib/test/test_augassign.py @@ -19,6 +19,9 @@ class AugAssignTest(unittest.TestCase): x /= 2 self.assertEquals(x, 3.0) + def test_with_unpacking(self): + self.assertRaises(SyntaxError, compile, "x, b += 3", "", "exec") + def testInList(self): x = [2] x[0] += 1 diff --git a/Python/ast.c b/Python/ast.c index 83572ee..b0684c5 100644 --- a/Python/ast.c +++ b/Python/ast.c @@ -2105,6 +2105,19 @@ ast_for_expr_stmt(struct compiling *c, const node *n) return NULL; if(!set_context(c, expr1, Store, ch)) return NULL; + /* set_context checks that most expressions are not the left side. + Augmented assignments can only have a name, a subscript, or an + attribute on the left, though, so we have to explicitly check for + those. */ + switch (expr1->kind) { + case Name_kind: + case Attribute_kind: + case Subscript_kind: + break; + default: + ast_error(ch, "illegal expression for augmented assignment"); + return NULL; + } ch = CHILD(n, 2); if (TYPE(ch) == testlist) -- cgit v0.12