[pypy-svn] pypy commit 947475d879e6: disable the EmptyDictImplementation for now, it really seems to be the reason for the breakage. I have absolutely no clue why, though.

Bitbucket commits-noreply at bitbucket.org
Wed Dec 15 14:14:55 CET 2010


# HG changeset patch -- Bitbucket.org
# Project pypy
# URL http://bitbucket.org/pypy/pypy/overview
# User Carl Friedrich Bolz <cfbolz at gmx.de>
# Date 1292418853 -3600
# Node ID 947475d879e69a63a0ecf34baa2c5ef6f125a3f6
# Parent  4481ab58c417341ea2411151c5094b671a3cb2a2
disable the EmptyDictImplementation for now, it really seems to be the reason for the breakage. I have absolutely no clue why, though.

--- a/pypy/objspace/std/dictmultiobject.py
+++ b/pypy/objspace/std/dictmultiobject.py
@@ -55,8 +55,9 @@ class W_DictMultiObject(W_Object):
         else:
             if w_type is None:
                 w_type = space.w_dict
-            w_self = space.allocate_instance(EmptyDictImplementation, w_type)
-            EmptyDictImplementation.__init__(w_self, space)
+            w_self = space.allocate_instance(W_DictMultiObject, w_type)
+            W_DictMultiObject.__init__(w_self, space)
+            w_self.initialize_as_rdict()
             return w_self
 
     def __init__(self, space):

--- a/pypy/objspace/std/test/test_dictmultiobject.py
+++ b/pypy/objspace/std/test/test_dictmultiobject.py
@@ -16,7 +16,7 @@ class TestW_DictObject:
         space = self.space
         d = self.space.newdict()
         assert not self.space.is_true(d)
-        assert d.r_dict_content is None
+        #assert d.r_dict_content is None
 
     def test_nonempty(self):
         space = self.space



More information about the Pypy-commit mailing list