diff options
| author | Raymond Hettinger <python@rcn.com> | 2009-05-29 04:58:52 (GMT) |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2009-05-29 04:58:52 (GMT) |
| commit | 578a228ee265e9ce4d88c01f8d9fd57a237cfc3e (patch) | |
| tree | 4e8e026d3e5c06f2048d2c872d42f2d666a93058 | |
| parent | 7937d939b1e41e869ebd6a41787c186482f5950f (diff) | |
| download | cpython-578a228ee265e9ce4d88c01f8d9fd57a237cfc3e.zip cpython-578a228ee265e9ce4d88c01f8d9fd57a237cfc3e.tar.gz cpython-578a228ee265e9ce4d88c01f8d9fd57a237cfc3e.tar.bz2 | |
Issue 5982: Classmethod and staticmethod expose wrapped function with __func__.
| -rw-r--r-- | Lib/test/test_funcattrs.py | 15 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Objects/funcobject.c | 14 |
3 files changed, 29 insertions, 3 deletions
diff --git a/Lib/test/test_funcattrs.py b/Lib/test/test_funcattrs.py index f374c8d..2961cd2 100644 --- a/Lib/test/test_funcattrs.py +++ b/Lib/test/test_funcattrs.py @@ -273,10 +273,23 @@ class FunctionDocstringTest(FuncAttrsTest): self.assertEqual(self.b.__doc__, None) self.assertEqual(self.b.func_doc, None) +class StaticMethodAttrsTest(unittest.TestCase): + def test_func_attribute(self): + def f(): + pass + + c = classmethod(f) + self.assert_(c.__func__ is f) + + s = staticmethod(f) + self.assert_(s.__func__ is f) + + def test_main(): test_support.run_unittest(FunctionPropertiesTest, ImplicitReferencesTest, ArbitraryFunctionAttrTest, FunctionDictsTest, - FunctionDocstringTest) + FunctionDocstringTest, + StaticMethodAttrsTest) if __name__ == "__main__": test_main() @@ -12,6 +12,9 @@ What's New in Python 2.7 alpha 1 Core and Builtins ----------------- +- Issue #5982: staticmethod and classmethod now expose the wrapped + function with __func__. + - Added support for multiple context managers in the same with-statement. Deprecated contextlib.nested() which is no longer needed. diff --git a/Objects/funcobject.c b/Objects/funcobject.c index a2e87b7..14484e5 100644 --- a/Objects/funcobject.c +++ b/Objects/funcobject.c @@ -669,6 +669,11 @@ cm_init(PyObject *self, PyObject *args, PyObject *kwds) return 0; } +static PyMemberDef cm_memberlist[] = { + {"__func__", T_OBJECT, offsetof(classmethod, cm_callable), READONLY}, + {NULL} /* Sentinel */ +}; + PyDoc_STRVAR(classmethod_doc, "classmethod(function) -> method\n\ \n\ @@ -719,7 +724,7 @@ PyTypeObject PyClassMethod_Type = { 0, /* tp_iter */ 0, /* tp_iternext */ 0, /* tp_methods */ - 0, /* tp_members */ + cm_memberlist, /* tp_members */ 0, /* tp_getset */ 0, /* tp_base */ 0, /* tp_dict */ @@ -819,6 +824,11 @@ sm_init(PyObject *self, PyObject *args, PyObject *kwds) return 0; } +static PyMemberDef sm_memberlist[] = { + {"__func__", T_OBJECT, offsetof(staticmethod, sm_callable), READONLY}, + {NULL} /* Sentinel */ +}; + PyDoc_STRVAR(staticmethod_doc, "staticmethod(function) -> method\n\ \n\ @@ -866,7 +876,7 @@ PyTypeObject PyStaticMethod_Type = { 0, /* tp_iter */ 0, /* tp_iternext */ 0, /* tp_methods */ - 0, /* tp_members */ + sm_memberlist, /* tp_members */ 0, /* tp_getset */ 0, /* tp_base */ 0, /* tp_dict */ |