[pypy-svn] r66491 - pypy/branch/parser-compiler/lib-python/modified-2.5.2/test

[benjamin at codespeak.net]

Author: benjamin
Date: Tue Jul 21 21:52:45 2009
New Revision: 66491

Modified:
   pypy/branch/parser-compiler/lib-python/modified-2.5.2/test/test_grammar.py
Log:
we now use cpython's naming scheme for implicit tuple unpacking

Modified: pypy/branch/parser-compiler/lib-python/modified-2.5.2/test/test_grammar.py
==============================================================================
--- pypy/branch/parser-compiler/lib-python/modified-2.5.2/test/test_grammar.py	(original)
+++ pypy/branch/parser-compiler/lib-python/modified-2.5.2/test/test_grammar.py	Tue Jul 21 21:52:45 2009
@@ -165,12 +165,7 @@
                         'list',))
     vereq(f5.func_code.co_varnames,
            ('(compound, first)', 'two', 'compound', 'first'))
-elif check_impl_detail(pypy=True):
-    vereq(f4.func_code.co_varnames,
-          ('two', '.2', 'compound', 'argument',  'list'))
-    vereq(f5.func_code.co_varnames,
-          ('.0', 'two', 'compound', 'first'))
-elif check_impl_detail(cpython=True):
+elif check_impl_detail(cpython=True, pypy=True):
     vereq(f4.func_code.co_varnames,
           ('two', '.1', 'compound', 'argument',  'list'))
     vereq(f5.func_code.co_varnames,
@@ -185,9 +180,7 @@
 # thus, the names nested inside tuples must appear after these names.
 if check_impl_detail(jython=True):
     verify(v3.func_code.co_varnames == ('a', '(b, c)', 'rest', 'b', 'c'))
-elif check_impl_detail(pypy=True):
-    vereq(v3.func_code.co_varnames, ('a', '.2', 'rest', 'b', 'c'))
-elif check_impl_detail(cpython=True):
+elif check_impl_detail(cpython=True, pypy=True):
     vereq(v3.func_code.co_varnames, ('a', '.1', 'rest', 'b', 'c'))
 verify(v3(1, (2, 3), 4) == (1, 2, 3, (4,)))
 def d01(a=1): pass