[pypy-svn] pypy out-of-line-guards: Newstylize, we should really get used to writing class X(object)

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: out-of-line-guards
Changeset: r40194:0cb68b871ee6
Date: 2010-12-23 10:42 +0200
http://bitbucket.org/pypy/pypy/changeset/0cb68b871ee6/

Log:	Newstylize, we should really get used to writing class X(object)

diff --git a/pypy/jit/backend/llgraph/llimpl.py b/pypy/jit/backend/llgraph/llimpl.py
--- a/pypy/jit/backend/llgraph/llimpl.py
+++ b/pypy/jit/backend/llgraph/llimpl.py
@@ -869,6 +869,8 @@
             self._may_force = -1
 
     def op_call_assembler(self, wref_loop_token, *args):
+        import pdb
+        pdb.set_trace()
         if we_are_translated():
             raise ValueError("CALL_ASSEMBLER not supported")
         return self._do_call_assembler(wref_loop_token, *args)

diff --git a/pypy/jit/metainterp/test/test_resume.py b/pypy/jit/metainterp/test/test_resume.py
--- a/pypy/jit/metainterp/test/test_resume.py
+++ b/pypy/jit/metainterp/test/test_resume.py
@@ -9,7 +9,7 @@
 from pypy.jit.metainterp import executor
 from pypy.jit.codewriter import heaptracker
 
-class Storage:
+class Storage(object):
     rd_frame_info_list = None
     rd_numb = None
     rd_consts = []
@@ -49,7 +49,7 @@
     assert v1.equals([1, 2, 4])
     assert not v1.equals([1, 2, 6])
 
-class MyMetaInterp:
+class MyMetaInterp(object):
     _already_allocated_resume_virtuals = None
     callinfocollection = None
 
@@ -81,7 +81,7 @@
 gcref2 = lltype.cast_opaque_ptr(llmemory.GCREF, lltype.malloc(S))
 gcrefnull = lltype.nullptr(llmemory.GCREF.TO)
 
-class MyCPU:
+class MyCPU(object):
     class ts:
         NULLREF = gcrefnull
         CONST_NULL = ConstPtr(gcrefnull)
@@ -96,7 +96,7 @@
     def get_latest_value_float(self, index):
         return self.values[index]
 
-class MyBlackholeInterp:
+class MyBlackholeInterp(object):
     def __init__(self, ARGS):
         self.written_i = []
         self.written_r = []
@@ -104,7 +104,7 @@
         self.ARGS = ARGS
 
     def get_current_position_info(self):
-        class MyInfo:
+        class MyInfo(object):
             @staticmethod
             def enumerate_vars(callback_i, callback_r, callback_f, _):
                 count_i = count_r = count_f = 0
@@ -475,10 +475,10 @@
     assert snapshot.boxes == fs[2]._env
 
 
-class FakeMetaInterpStaticData:
+class FakeMetaInterpStaticData(object):
     cpu = LLtypeMixin.cpu
 
-    class options:
+    class options(object):
         failargs_limit = 100
 
 def test_rebuild_from_resumedata():
@@ -574,7 +574,7 @@
 
 
 class FakeOptimizer_VirtualValue(object):
-    class cpu:
+    class cpu(object):
         pass
 fakeoptimizer = FakeOptimizer_VirtualValue()