[pypy-commit] pypy default: merge heads

[bdkearns]

Author: Brian Kearns <bdkearns at gmail.com>
Branch: 
Changeset: r73131:fc874a203461
Date: 2014-08-28 19:45 -0400
http://bitbucket.org/pypy/pypy/changeset/fc874a203461/

Log:	merge heads

diff --git a/pypy/interpreter/typedef.py b/pypy/interpreter/typedef.py
--- a/pypy/interpreter/typedef.py
+++ b/pypy/interpreter/typedef.py
@@ -818,6 +818,9 @@
 
 Method.typedef = TypeDef(
     "method",
+    __doc__ = """instancemethod(function, instance, class)
+
+Create an instance method object.""",
     __new__ = interp2app(Method.descr_method__new__.im_func),
     __call__ = interp2app(Method.descr_method_call),
     __get__ = interp2app(Method.descr_method_get),
@@ -833,7 +836,6 @@
     __repr__ = interp2app(Method.descr_method_repr),
     __reduce__ = interp2app(Method.descr_method__reduce__),
     __weakref__ = make_weakref_descr(Method),
-    __doc__ = """instancemethod(function, instance, class)\n\nCreate an instance method object."""
     )
 Method.typedef.acceptable_as_base_class = False