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

[fijal at codespeak.net]

Author: fijal
Date: Wed Jan 14 14:47:38 2009
New Revision: 60957

Modified:
   pypy/trunk/pypy/interpreter/astcompiler/pyassem.py
   pypy/trunk/pypy/interpreter/test/test_code.py
Log:
A test and a fix (2.5 changes behavior of co_names)


Modified: pypy/trunk/pypy/interpreter/astcompiler/pyassem.py
==============================================================================
--- pypy/trunk/pypy/interpreter/astcompiler/pyassem.py	(original)
+++ pypy/trunk/pypy/interpreter/astcompiler/pyassem.py	Wed Jan 14 14:47:38 2009
@@ -174,7 +174,6 @@
                                     % name)
 
     def _convert_LOAD_FAST(self, arg):
-        self._lookupName(arg, self.names)
         return self._lookupName(arg, self.varnames)
     _convert_STORE_FAST = _convert_LOAD_FAST
     _convert_DELETE_FAST = _convert_LOAD_FAST

Modified: pypy/trunk/pypy/interpreter/test/test_code.py
==============================================================================
--- pypy/trunk/pypy/interpreter/test/test_code.py	(original)
+++ pypy/trunk/pypy/interpreter/test/test_code.py	Wed Jan 14 14:47:38 2009
@@ -64,7 +64,7 @@
                 assert getattr(code, key) == value
 
     def test_co_names(self):
-        skip("Fails")
+        src = '''if 1:
         def foo():
             pass
 
@@ -73,8 +73,11 @@
         def f(x, y):
             z = x + y
             foo(g)
+'''
+        d = {}
+        exec src in d
 
-        assert f.func_code.co_names == ('foo', 'g')
+        assert list(sorted(d['f'].func_code.co_names)) == ['foo', 'g']
 
     def test_code(self):
         import sys