[pypy-svn] r66517 - in pypy/branch/parser-compiler: lib-python/modified-2.5.2/test pypy/interpreter/astcompiler

[benjamin at codespeak.net]

Author: benjamin
Date: Wed Jul 22 22:37:08 2009
New Revision: 66517

Modified:
   pypy/branch/parser-compiler/lib-python/modified-2.5.2/test/test_generators.py
   pypy/branch/parser-compiler/pypy/interpreter/astcompiler/astbuilder.py
Log:
spelling out expression is just fine

Modified: pypy/branch/parser-compiler/lib-python/modified-2.5.2/test/test_generators.py
==============================================================================
--- pypy/branch/parser-compiler/lib-python/modified-2.5.2/test/test_generators.py	(original)
+++ pypy/branch/parser-compiler/lib-python/modified-2.5.2/test/test_generators.py	Wed Jul 22 22:37:08 2009
@@ -1535,17 +1535,17 @@
 >>> def f(): x = yield = y
 Traceback (most recent call last):
   ...
-SyntaxError: can't assign to yield expr (<doctest test.test_generators.__test__.coroutine[23]>, line 1)
+SyntaxError: ccan't assign to yield expression (<doctest test.test_generators.__test__.coroutine[23]>, line 1)
 
 >>> def f(): (yield bar) = y
 Traceback (most recent call last):
   ...
-SyntaxError: can't assign to yield expr (<doctest test.test_generators.__test__.coroutine[24]>, line 1)
+SyntaxError: can't assign to yield expression (<doctest test.test_generators.__test__.coroutine[24]>, line 1)
 
 >>> def f(): (yield bar) += y
 Traceback (most recent call last):
   ...
-SyntaxError: can't assign to yield expr (<doctest test.test_generators.__test__.coroutine[25]>, line 1)
+SyntaxError: can't assign to yield expression (<doctest test.test_generators.__test__.coroutine[25]>, line 1)
 
 
 Now check some throw() conditions:

Modified: pypy/branch/parser-compiler/pypy/interpreter/astcompiler/astbuilder.py
==============================================================================
--- pypy/branch/parser-compiler/pypy/interpreter/astcompiler/astbuilder.py	(original)
+++ pypy/branch/parser-compiler/pypy/interpreter/astcompiler/astbuilder.py	Wed Jul 22 22:37:08 2009
@@ -715,7 +715,7 @@
             for i in range(0, len(stmt.children) - 2, 2):
                 target_node = stmt.children[i]
                 if target_node.type == syms.yield_expr:
-                    self.error("can't assign to yield expr", target_node)
+                    self.error("can't assign to yield expression", target_node)
                 target_expr = self.handle_testlist(target_node)
                 self.set_context(target_expr, ast.Store, target_node)
                 targets.append(target_expr)