[pypy-commit] pypy py3.3: Merged in marky1991/pypy_new/py3.3 (pull request #398)

[mjacob]

Author: Manuel Jacob <me at manueljacob.de>
Branch: py3.3
Changeset: r82207:d31526af1a0e
Date: 2016-02-13 13:32 +0100
http://bitbucket.org/pypy/pypy/changeset/d31526af1a0e/

Log:	Merged in marky1991/pypy_new/py3.3 (pull request #398)

	Fix translation for 3.3.

diff --git a/pypy/interpreter/mixedmodule.py b/pypy/interpreter/mixedmodule.py
--- a/pypy/interpreter/mixedmodule.py
+++ b/pypy/interpreter/mixedmodule.py
@@ -66,11 +66,9 @@
         # 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()
-            while True:
-                w_key, w_value = new_items.next_item()
-                if w_key is None:
-                    break
+            w_items = self.space.iteriterable(self.space.call_method(self.w_dict,'items'))
+            for w_item in w_items:
+                w_key, w_value = self.space.fixedview(w_item, expected_length=2)
                 if not self.space.is_true(self.space.contains(self.w_initialdict, w_key)):
                     self.space.setitem(self.w_initialdict, w_key, w_value)
         else: