Author: Philip Jenvey <pjen...@underboss.org>
Branch: stdlib-3.2.5
Changeset: r70494:52f0a7a337d7
Date: 2014-04-08 16:21 -0700
http://bitbucket.org/pypy/pypy/changeset/52f0a7a337d7/

Log:    workaround for staticmethod descriptors on PyPy

diff --git a/lib-python/3/test/test_pydoc.py b/lib-python/3/test/test_pydoc.py
--- a/lib-python/3/test/test_pydoc.py
+++ b/lib-python/3/test/test_pydoc.py
@@ -417,6 +417,8 @@
 
         # What we expect to get back: everything on object...
         expected = dict(vars(object))
+        # __new__'s descriptor can be a staticmethod on PyPy
+        expected['__new__'] = object.__new__
         # ...plus our unbound method...
         expected['method_returning_true'] = TestClass.method_returning_true
         # ...but not the non-methods on object.
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to