[pypy-commit] pypy remove-tuple-smm: hg merge default

[Manuel Jacob]

Author: Manuel Jacob
Branch: remove-tuple-smm
Changeset: r64454:c365929ecf63
Date: 2013-05-22 15:47 +0200
http://bitbucket.org/pypy/pypy/changeset/c365929ecf63/

Log:	hg merge default

diff --git a/pypy/objspace/std/objspace.py b/pypy/objspace/std/objspace.py
--- a/pypy/objspace/std/objspace.py
+++ b/pypy/objspace/std/objspace.py
@@ -663,6 +663,15 @@
                 class2type[base] = w_type
                 self._interplevel_classes[w_type] = base
 
+        # register other things
+        from pypy.objspace.std.dictmultiobject import W_DictMultiObject
+        from pypy.objspace.std.listobject import W_ListObject
+        from pypy.objspace.std.setobject import W_SetObject
+
+        self._interplevel_classes[self.w_dict] = W_DictMultiObject
+        self._interplevel_classes[self.w_list] = W_ListObject
+        self._interplevel_classes[self.w_set] = W_SetObject
+
     @specialize.memo()
     def _get_interplevel_cls(self, w_type):
         if not hasattr(self, "_interplevel_classes"):