[pypy-commit] pypy py3.5: hg merge default

[mjacob]

Author: Manuel Jacob <me at manueljacob.de>
Branch: py3.5
Changeset: r90471:dc0536431eaa
Date: 2017-03-02 11:41 +0100
http://bitbucket.org/pypy/pypy/changeset/dc0536431eaa/

Log:	hg merge default

diff --git a/pypy/objspace/std/test/test_dictmultiobject.py b/pypy/objspace/std/test/test_dictmultiobject.py
--- a/pypy/objspace/std/test/test_dictmultiobject.py
+++ b/pypy/objspace/std/test/test_dictmultiobject.py
@@ -817,9 +817,11 @@
         class BadEq(object):
             def __eq__(self, other):
                 raise ZeroDivisionError
+            def __hash__(self):
+                return 7
         k = BadEq()
         v = BadEq()
-        assert (k, v) in {k: v}.viewitems()
+        assert (k, v) in {k: v}.items()
 
     def test_dict_mixed_keys_items(self):
         d = {(1, 1): 11, (2, 2): 22}