summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Misc/NEWS3
-rw-r--r--Objects/classobject.c4
2 files changed, 7 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 2975c15..5382c84 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 2.6 alpha 2?
Core and builtins
-----------------
+- Issue 2332: add new attribute names for instance method objects.
+ The two changes are: im_self -> __self__ and im_func -> __func__
+
- Issue 2379: Raise a Py3K warning for __getitem__ or __getslice__ on
exception instances.
diff --git a/Objects/classobject.c b/Objects/classobject.c
index 6c77153..caf6b3e 100644
--- a/Objects/classobject.c
+++ b/Objects/classobject.c
@@ -2242,8 +2242,12 @@ static PyMemberDef instancemethod_memberlist[] = {
"the class associated with a method"},
{"im_func", T_OBJECT, OFF(im_func), READONLY|RESTRICTED,
"the function (or other callable) implementing a method"},
+ {"__func__", T_OBJECT, OFF(im_func), READONLY|RESTRICTED,
+ "the function (or other callable) implementing a method"},
{"im_self", T_OBJECT, OFF(im_self), READONLY|RESTRICTED,
"the instance to which a method is bound; None for unbound methods"},
+ {"__self__", T_OBJECT, OFF(im_self), READONLY|RESTRICTED,
+ "the instance to which a method is bound; None for unbound methods"},
{NULL} /* Sentinel */
};