Author: Armin Rigo <ar...@tunes.org>
Branch: py3k
Changeset: r86767:8be5d923f6ae
Date: 2016-08-31 10:40 +0200
http://bitbucket.org/pypy/pypy/changeset/8be5d923f6ae/
Log: merge heads
diff --git a/pypy/module/__builtin__/test/test_builtin.py
b/pypy/module/__builtin__/test/test_builtin.py
--- a/pypy/module/__builtin__/test/test_builtin.py
+++ b/pypy/module/__builtin__/test/test_builtin.py
@@ -850,6 +850,9 @@
raises(TypeError, delattr, A(), 42)
def test_getattr_None(self):
+ import sys
+ if '__pypy__' not in sys.modules:
+ skip('CPython uses wrapper types for this')
from types import FunctionType, MethodType
assert isinstance(getattr(type(None), '__eq__'), FunctionType)
assert isinstance(getattr(None, '__eq__'), MethodType)
@@ -864,4 +867,3 @@
assert isinstance(getattr(a, '__eq__'), MethodType)
a.__eq__ = 42
assert a.__eq__ == 42
-
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
