[pypy-svn] r77906 - pypy/branch/32ptr-on-64bit/pypy/objspace/std

arigo at codespeak.net arigo at codespeak.net
Thu Oct 14 11:43:47 CEST 2010


Author: arigo
Date: Thu Oct 14 11:43:46 2010
New Revision: 77906

Modified:
   pypy/branch/32ptr-on-64bit/pypy/objspace/std/mapdict.py
Log:
Revert this part of the change.  ObjectMixin is needed
by interpreter/typedef.py.


Modified: pypy/branch/32ptr-on-64bit/pypy/objspace/std/mapdict.py
==============================================================================
--- pypy/branch/32ptr-on-64bit/pypy/objspace/std/mapdict.py	(original)
+++ pypy/branch/32ptr-on-64bit/pypy/objspace/std/mapdict.py	Thu Oct 14 11:43:46 2010
@@ -359,8 +359,8 @@
         assert isinstance(weakreflifeline, WeakrefLifeline)
         self._get_mapdict_map().write(self, ("weakref", SPECIAL), weakreflifeline)
 
-class Object(BaseMapdictObject, W_Root):
-    # mainly for tests
+class ObjectMixin(object):
+    _mixin_ = True
     def _init_empty(self, map):
         from pypy.rlib.debug import make_sure_not_resized
         self.map = map
@@ -376,6 +376,9 @@
         self.storage = storage
         self.map = map
 
+class Object(ObjectMixin, BaseMapdictObject, W_Root):
+    pass # mainly for tests
+
 def get_subclass_of_correct_size(space, cls, w_type):
     assert space.config.objspace.std.withmapdict
     map = w_type.terminator



More information about the Pypy-commit mailing list