[pypy-svn] r61548 - in pypy/trunk/pypy/interpreter: astcompiler/test pyparser

[fijal at codespeak.net]

Author: fijal
Date: Wed Feb  4 14:59:54 2009
New Revision: 61548

Modified:
   pypy/trunk/pypy/interpreter/astcompiler/test/test_compiler.py
   pypy/trunk/pypy/interpreter/pyparser/astbuilder.py
Log:
a test and a fix, hairy...


Modified: pypy/trunk/pypy/interpreter/astcompiler/test/test_compiler.py
==============================================================================
--- pypy/trunk/pypy/interpreter/astcompiler/test/test_compiler.py	(original)
+++ pypy/trunk/pypy/interpreter/astcompiler/test/test_compiler.py	Wed Feb  4 14:59:54 2009
@@ -681,4 +681,10 @@
         """
         py.test.raises(SyntaxError, self.simple_test, source, None, None)
 
-    
+    def test_unpack_singletuple(self):
+        source = """if 1:
+        l = []
+        for x, in [(1,), (2,)]:
+            l.append(x)
+        """
+        self.simple_test(source, 'l', [1, 2])

Modified: pypy/trunk/pypy/interpreter/pyparser/astbuilder.py
==============================================================================
--- pypy/trunk/pypy/interpreter/pyparser/astbuilder.py	(original)
+++ pypy/trunk/pypy/interpreter/pyparser/astbuilder.py	Wed Feb  4 14:59:54 2009
@@ -727,7 +727,7 @@
 def build_exprlist(builder, nb):
     """exprlist: expr (',' expr)* [',']"""
     atoms = get_atoms(builder, nb)
-    if len(atoms) <= 2:
+    if len(atoms) < 2:
         builder.push(atoms[0])
     else:
         items = [atoms[index] for index in range(0, len(atoms), 2)]