Author: Armin Rigo <ar...@tunes.org>
Branch: py3.5
Changeset: r91843:7888ede0c136
Date: 2017-07-08 17:11 +0200
http://bitbucket.org/pypy/pypy/changeset/7888ede0c136/
Log: hg merge default
diff --git a/pypy/module/__builtin__/test/test_functional.py
b/pypy/module/__builtin__/test/test_functional.py
--- a/pypy/module/__builtin__/test/test_functional.py
+++ b/pypy/module/__builtin__/test/test_functional.py
@@ -539,6 +539,7 @@
raises(TypeError, reversed, {})
raises(TypeError, reversed, {2: 3})
assert not hasattr(dict, '__reversed__')
+ raises(TypeError, reversed, int.__dict__)
def test_reversed_type_with_no_len(self):
class X(object):
diff --git a/pypy/objspace/std/test/test_dictproxy.py
b/pypy/objspace/std/test/test_dictproxy.py
--- a/pypy/objspace/std/test/test_dictproxy.py
+++ b/pypy/objspace/std/test/test_dictproxy.py
@@ -77,5 +77,6 @@
#
{}.update(proxy)
+
class AppTestUserObjectMethodCache(AppTestUserObject):
spaceconfig = {"objspace.std.withmethodcachecounter": True}
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
