[pypy-svn] r78976 - pypy/branch/rlist-jit/pypy/objspace/std

arigo at codespeak.net arigo at codespeak.net
Wed Nov 10 17:37:45 CET 2010


Author: arigo
Date: Wed Nov 10 17:37:43 2010
New Revision: 78976

Modified:
   pypy/branch/rlist-jit/pypy/objspace/std/typeobject.py
Log:
Last fix.  Annotation without all working modules work.


Modified: pypy/branch/rlist-jit/pypy/objspace/std/typeobject.py
==============================================================================
--- pypy/branch/rlist-jit/pypy/objspace/std/typeobject.py	(original)
+++ pypy/branch/rlist-jit/pypy/objspace/std/typeobject.py	Wed Nov 10 17:37:43 2010
@@ -11,7 +11,6 @@
 from pypy.rlib.objectmodel import current_object_addr_as_int, compute_hash
 from pypy.rlib.jit import hint, purefunction_promote, we_are_jitted
 from pypy.rlib.jit import dont_look_inside, purefunction
-from pypy.rlib.debug import list_not_modified_any_more
 from pypy.rlib.rarithmetic import intmask, r_uint
 
 from copy_reg import _HEAPTYPE
@@ -619,7 +618,7 @@
     ensure_doc_attr(w_self)
     if w_self.is_heaptype():
         ensure_module_attr(w_self)
-    w_self.mro_w = list_not_modified_any_more([])      # temporarily
+    w_self.mro_w = []      # temporarily
     compute_mro(w_self)
 
 def ensure_static_new(w_self):
@@ -653,7 +652,7 @@
         if w_mro_func is not None and not space.is_w(w_where, space.w_type):
             w_mro_meth = space.get(w_mro_func, w_self)
             w_mro = space.call_function(w_mro_meth)
-            mro_w = space.fixedview(w_mro)
+            mro_w = space.fixedview(w_mro)[:]
             w_self.mro_w = validate_custom_mro(space, mro_w)
             return    # done
     w_self.mro_w = w_self.compute_default_mro()[:]



More information about the Pypy-commit mailing list