From b1d3d96374294904a13717403c80035718331092 Mon Sep 17 00:00:00 2001 From: Neal Norwitz Date: Tue, 18 Mar 2008 04:46:00 +0000 Subject: [PATCH] Issue 2332: add new attribute names for instance method objects --- Misc/NEWS | 3 +++ Objects/classobject.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/Misc/NEWS b/Misc/NEWS index 2975c1530b1..5382c84a789 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 6c77153959b..caf6b3e7b0d 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 */ };