Author: Manuel Jacob <[email protected]>
Branch: py3.3
Changeset: r82205:fc48d0bd0c1d
Date: 2016-02-13 13:30 +0100
http://bitbucket.org/pypy/pypy/changeset/fc48d0bd0c1d/
Log: hg backout fce240f22548
diff --git a/pypy/interpreter/mixedmodule.py b/pypy/interpreter/mixedmodule.py
--- a/pypy/interpreter/mixedmodule.py
+++ b/pypy/interpreter/mixedmodule.py
@@ -66,10 +66,7 @@
# 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):
- w_dict = self.w_dict
- from pypy.objspace.std.dictmultiobject import W_DictMultiObject
- assert isinstance(w_dict, W_DictMultiObject)
- new_items = w_dict.iteritems()
+ new_items = self.w_dict.iteritems()
while True:
w_key, w_value = new_items.next_item()
if w_key is None:
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
