Author: Manuel Jacob <m...@manueljacob.de>
Branch: py3.3
Changeset: r82201:fce240f22548
Date: 2016-02-13 04:37 +0100
http://bitbucket.org/pypy/pypy/changeset/fce240f22548/

Log:    Tentatively fix translation.

        This is not a proper fix because a MixedModule's dictionary does not
        have to be a W_DictMultiObject. However, this is good enough for
        running the build bots. I'll commit a proper fix tomorrow.

diff --git a/pypy/interpreter/mixedmodule.py b/pypy/interpreter/mixedmodule.py
--- a/pypy/interpreter/mixedmodule.py
+++ b/pypy/interpreter/mixedmodule.py
@@ -66,7 +66,10 @@
         # overwrite the value of a key already in w_initialdict. (So as to 
avoid
         # overriding the builtin value with a user-provided value)
         if not self.space.is_none(self.w_initialdict):
-            new_items = self.w_dict.iteritems()
+            w_dict = self.w_dict
+            from pypy.objspace.std.dictmultiobject import W_DictMultiObject
+            assert isinstance(w_dict, W_DictMultiObject)
+            new_items = w_dict.iteritems()
             while True:
                 w_key, w_value = new_items.next_item()
                 if w_key is None:
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to