PEP 3123: Provide forward compatibility with Python 3.0, while keeping
backwards compatibility. Add Py_Refcnt, Py_Type, Py_Size, and
PyVarObject_HEAD_INIT.
diff --git a/Objects/funcobject.c b/Objects/funcobject.c
index 190765a..913c8c5 100644
--- a/Objects/funcobject.c
+++ b/Objects/funcobject.c
@@ -544,8 +544,7 @@
}
PyTypeObject PyFunction_Type = {
- PyObject_HEAD_INIT(&PyType_Type)
- 0,
+ PyVarObject_HEAD_INIT(&PyType_Type, 0)
"function",
sizeof(PyFunctionObject),
0,
@@ -615,7 +614,7 @@
{
_PyObject_GC_UNTRACK((PyObject *)cm);
Py_XDECREF(cm->cm_callable);
- cm->ob_type->tp_free((PyObject *)cm);
+ Py_Type(cm)->tp_free((PyObject *)cm);
}
static int
@@ -644,9 +643,9 @@
return NULL;
}
if (type == NULL)
- type = (PyObject *)(obj->ob_type);
+ type = (PyObject *)(Py_Type(obj));
return PyMethod_New(cm->cm_callable,
- type, (PyObject *)(type->ob_type));
+ type, (PyObject *)(Py_Type(type)));
}
static int
@@ -692,8 +691,7 @@
If you want those, see the staticmethod builtin.");
PyTypeObject PyClassMethod_Type = {
- PyObject_HEAD_INIT(&PyType_Type)
- 0,
+ PyVarObject_HEAD_INIT(&PyType_Type, 0)
"classmethod",
sizeof(classmethod),
0,
@@ -773,7 +771,7 @@
{
_PyObject_GC_UNTRACK((PyObject *)sm);
Py_XDECREF(sm->sm_callable);
- sm->ob_type->tp_free((PyObject *)sm);
+ Py_Type(sm)->tp_free((PyObject *)sm);
}
static int
@@ -840,8 +838,7 @@
For a more advanced concept, see the classmethod builtin.");
PyTypeObject PyStaticMethod_Type = {
- PyObject_HEAD_INIT(&PyType_Type)
- 0,
+ PyVarObject_HEAD_INIT(&PyType_Type, 0)
"staticmethod",
sizeof(staticmethod),
0,