[pypy-commit] pypy jit-settrace: Fixed tests

[alex_gaynor]

Author: Alex Gaynor <alex.gaynor at gmail.com>
Branch: jit-settrace
Changeset: r67586:bab17124e8a3
Date: 2013-10-24 14:14 -0700
http://bitbucket.org/pypy/pypy/changeset/bab17124e8a3/

Log:	Fixed tests

diff --git a/pypy/interpreter/test/test_eval.py b/pypy/interpreter/test/test_eval.py
--- a/pypy/interpreter/test/test_eval.py
+++ b/pypy/interpreter/test/test_eval.py
@@ -3,67 +3,63 @@
 from pypy.interpreter.pycode import PyCode
 
 
-class TestFrame: 
+class TestFrame:
     def setup_method(self, method):
         def c(x, y, *args):
             pass
         code = PyCode._from_code(self.space, c.func_code)
 
         class ConcreteFastscopeFrame(Frame):
-            
             def __init__(self, space, code, numlocals):
                 self.code = code
+                self.code.co_nlocals = numlocals
                 Frame.__init__(self, space)
-                self.numlocals = numlocals
-                self._fastlocals_w = [None] * self.numlocals
+                self.locals_stack_w = [None] * numlocals
 
             def getcode(self):
                 return self.code
 
             def setfastscope(self, scope_w):
-                self._fastlocals_w = scope_w
+                self.locals_stack_w = scope_w
 
             def getfastscope(self):
-                return self._fastlocals_w
-
-            def getfastscopelength(self):
-                return self.numlocals
+                return self.locals_stack_w
 
         self.f = ConcreteFastscopeFrame(self.space, code, numlocals=5)
-        
+
 
     def test_fast2locals(self):
-        space = self.space 
+        space = self.space
         w = space.wrap
         self.f.fast2locals()
         assert space.eq_w(self.f.w_locals, self.space.wrap({}))
-        
-        self.f._fastlocals_w[0] = w(5)
+
+        self.f.locals_stack_w[0] = w(5)
         self.f.fast2locals()
         assert space.eq_w(self.f.w_locals, self.space.wrap({'x': 5}))
 
-        self.f._fastlocals_w[2] = w(7)
+        self.f.locals_stack_w[2] = w(7)
         self.f.fast2locals()
         assert space.eq_w(self.f.w_locals, self.space.wrap({'x': 5, 'args': 7}))
 
     def sameList(self, l1, l2):
-        assert len(l1) == len(l2) 
+        assert len(l1) == len(l2)
         for w_1, w_2 in zip(l1, l2):
             assert (w_1 is None) == (w_2 is None)
             if w_1 is not None:
-                assert self.space.eq_w(w_1, w_2) 
+                assert self.space.eq_w(w_1, w_2)
 
     def test_locals2fast(self):
         w = self.space.wrap
         self.f.w_locals = self.space.wrap({})
         self.f.locals2fast()
-        self.sameList(self.f._fastlocals_w, [None]*5)
+        self.sameList(self.f.locals_stack_w, [None] * 5)
 
         self.f.w_locals = self.space.wrap({'x': 5})
         self.f.locals2fast()
-        self.sameList(self.f._fastlocals_w, [w(5)] + [None]*4)
+        self.sameList(self.f.locals_stack_w, [w(5)] + [None] * 4)
 
-        self.f.w_locals = self.space.wrap({'x':5, 'args':7})
+        self.f.w_locals = self.space.wrap({'x': 5, 'args': 7})
         self.f.locals2fast()
-        self.sameList(self.f._fastlocals_w, [w(5), None, w(7),
+        self.sameList(self.f.locals_stack_w, [w(5), None, w(7),
                                              None, None])