Author: Philip Jenvey <[email protected]>
Branch: stdlib-2.7.8
Changeset: r72984:3388e7753506
Date: 2014-08-22 17:25 -0700
http://bitbucket.org/pypy/pypy/changeset/3388e7753506/
Log: reapply our workaround
diff --git a/lib-python/2.7/test/test_descr.py
b/lib-python/2.7/test/test_descr.py
--- a/lib-python/2.7/test/test_descr.py
+++ b/lib-python/2.7/test/test_descr.py
@@ -4452,7 +4452,7 @@
self.assertNotEqual(l.__add__, [5].__add__)
self.assertNotEqual(l.__add__, l.__mul__)
self.assertEqual(l.__add__.__name__, '__add__')
- if hasattr(l.__add__, '__self__'):
+ if hasattr(l.__add__, '__objclass__'):
# CPython
self.assertIs(l.__add__.__self__, l)
self.assertIs(l.__add__.__objclass__, list)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
