commit 01d7eba3162af8a0f62d7636cbb44440901b3909
author Benjamin Peterson <benjamin@python.org> Sun Feb 19 01:10:25 2012 -0500
committer Benjamin Peterson <benjamin@python.org> Sun Feb 19 01:10:25 2012 -0500
tree cd38f465ca59199a663e3846d45384cfa5579137
parent dc1d3eda1f7fe45f111f6e6d58635de06e04e655

allow arbitrary attributes on classmethod and staticmethod (closes #14051)

Objects/funcobject.c

diff --git a/Objects/funcobject.c b/Objects/funcobject.c
index b93f340..5db86a6 100644
--- a/Objects/funcobject.c
+++ b/Objects/funcobject.c
@@ -754,6 +754,7 @@
 typedef struct {
     PyObject_HEAD
     PyObject *cm_callable;
+    PyObject *cm_dict;
 } classmethod;
 
 static void
@@ -761,6 +762,7 @@
 {
     _PyObject_GC_UNTRACK((PyObject *)cm);
     Py_XDECREF(cm->cm_callable);
+    Py_XDECREF(cm->cm_dict);
     Py_TYPE(cm)->tp_free((PyObject *)cm);
 }
 
@@ -768,6 +770,7 @@
 cm_traverse(classmethod *cm, visitproc visit, void *arg)
 {
     Py_VISIT(cm->cm_callable);
+    Py_VISIT(cm->cm_dict);
     return 0;
 }
 
@@ -775,6 +778,7 @@
 cm_clear(classmethod *cm)
 {
     Py_CLEAR(cm->cm_callable);
+    Py_CLEAR(cm->cm_dict);
     return 0;
 }
 
@@ -827,11 +831,19 @@
     Py_RETURN_FALSE;
 }
 
+static PyObject *
+cm_get___dict__(classmethod *cm, void *closure)
+{
+    Py_INCREF(cm->cm_dict);
+    return cm->cm_dict;
+}
+
 static PyGetSetDef cm_getsetlist[] = {
     {"__isabstractmethod__",
      (getter)cm_get___isabstractmethod__, NULL,
      NULL,
      NULL},
+    {"__dict__", (getter)cm_get___dict__, NULL, NULL, NULL},
     {NULL} /* Sentinel */
 };
 
@@ -891,7 +903,7 @@
     0,                                          /* tp_dict */
     cm_descr_get,                               /* tp_descr_get */
     0,                                          /* tp_descr_set */
-    0,                                          /* tp_dictoffset */
+    offsetof(classmethod, cm_dict),             /* tp_dictoffset */
     cm_init,                                    /* tp_init */
     PyType_GenericAlloc,                        /* tp_alloc */
     PyType_GenericNew,                          /* tp_new */
@@ -930,6 +942,7 @@
 typedef struct {
     PyObject_HEAD
     PyObject *sm_callable;
+    PyObject *sm_dict;
 } staticmethod;
 
 static void
@@ -937,6 +950,7 @@
 {
     _PyObject_GC_UNTRACK((PyObject *)sm);
     Py_XDECREF(sm->sm_callable);
+    Py_XDECREF(sm->sm_dict);
     Py_TYPE(sm)->tp_free((PyObject *)sm);
 }
 
@@ -944,6 +958,7 @@
 sm_traverse(staticmethod *sm, visitproc visit, void *arg)
 {
     Py_VISIT(sm->sm_callable);
+    Py_VISIT(sm->sm_dict);
     return 0;
 }
 
@@ -952,6 +967,7 @@
 {
     Py_XDECREF(sm->sm_callable);
     sm->sm_callable = NULL;
+    Py_CLEAR(sm->sm_dict);
 
     return 0;
 }
@@ -1003,11 +1019,19 @@
     Py_RETURN_FALSE;
 }
 
+static PyObject *
+sm_get___dict__(staticmethod *sm, void *closure)
+{
+    Py_INCREF(sm->sm_dict);
+    return sm->sm_dict;
+}
+
 static PyGetSetDef sm_getsetlist[] = {
     {"__isabstractmethod__",
      (getter)sm_get___isabstractmethod__, NULL,
      NULL,
      NULL},
+    {"__dict__", (getter)sm_get___dict__, NULL, NULL, NULL},
     {NULL} /* Sentinel */
 };
 
@@ -1046,7 +1070,7 @@
     0,                                          /* tp_hash */
     0,                                          /* tp_call */
     0,                                          /* tp_str */
-    PyObject_GenericGetAttr,                    /* tp_getattro */
+    0,                                          /* tp_getattro */
     0,                                          /* tp_setattro */
     0,                                          /* tp_as_buffer */
     Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC,
@@ -1064,7 +1088,7 @@
     0,                                          /* tp_dict */
     sm_descr_get,                               /* tp_descr_get */
     0,                                          /* tp_descr_set */
-    0,                                          /* tp_dictoffset */
+    offsetof(staticmethod, sm_dict),            /* tp_dictoffset */
     sm_init,                                    /* tp_init */
     PyType_GenericAlloc,                        /* tp_alloc */
     PyType_GenericNew,                          /* tp_new */