mirror of
https://github.com/python/cpython.git
synced 2025-11-01 18:51:43 +00:00
PEP 3123: Provide forward compatibility with Python 3.0, while keeping
backwards compatibility. Add Py_Refcnt, Py_Type, Py_Size, and PyVarObject_HEAD_INIT.
This commit is contained in:
parent
b1994b4a5d
commit
6819210b9e
129 changed files with 1090 additions and 1250 deletions
|
|
@ -382,8 +382,7 @@ descr_traverse(PyObject *self, visitproc visit, void *arg)
|
|||
}
|
||||
|
||||
static PyTypeObject PyMethodDescr_Type = {
|
||||
PyObject_HEAD_INIT(&PyType_Type)
|
||||
0,
|
||||
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
||||
"method_descriptor",
|
||||
sizeof(PyMethodDescrObject),
|
||||
0,
|
||||
|
|
@ -421,8 +420,7 @@ static PyTypeObject PyMethodDescr_Type = {
|
|||
|
||||
/* This is for METH_CLASS in C, not for "f = classmethod(f)" in Python! */
|
||||
static PyTypeObject PyClassMethodDescr_Type = {
|
||||
PyObject_HEAD_INIT(&PyType_Type)
|
||||
0,
|
||||
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
||||
"classmethod_descriptor",
|
||||
sizeof(PyMethodDescrObject),
|
||||
0,
|
||||
|
|
@ -459,8 +457,7 @@ static PyTypeObject PyClassMethodDescr_Type = {
|
|||
};
|
||||
|
||||
static PyTypeObject PyMemberDescr_Type = {
|
||||
PyObject_HEAD_INIT(&PyType_Type)
|
||||
0,
|
||||
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
||||
"member_descriptor",
|
||||
sizeof(PyMemberDescrObject),
|
||||
0,
|
||||
|
|
@ -497,8 +494,7 @@ static PyTypeObject PyMemberDescr_Type = {
|
|||
};
|
||||
|
||||
static PyTypeObject PyGetSetDescr_Type = {
|
||||
PyObject_HEAD_INIT(&PyType_Type)
|
||||
0,
|
||||
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
||||
"getset_descriptor",
|
||||
sizeof(PyGetSetDescrObject),
|
||||
0,
|
||||
|
|
@ -535,8 +531,7 @@ static PyTypeObject PyGetSetDescr_Type = {
|
|||
};
|
||||
|
||||
PyTypeObject PyWrapperDescr_Type = {
|
||||
PyObject_HEAD_INIT(&PyType_Type)
|
||||
0,
|
||||
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
||||
"wrapper_descriptor",
|
||||
sizeof(PyWrapperDescrObject),
|
||||
0,
|
||||
|
|
@ -825,8 +820,7 @@ proxy_richcompare(proxyobject *v, PyObject *w, int op)
|
|||
}
|
||||
|
||||
static PyTypeObject proxytype = {
|
||||
PyObject_HEAD_INIT(&PyType_Type)
|
||||
0, /* ob_size */
|
||||
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
||||
"dictproxy", /* tp_name */
|
||||
sizeof(proxyobject), /* tp_basicsize */
|
||||
0, /* tp_itemsize */
|
||||
|
|
@ -1007,8 +1001,7 @@ wrapper_traverse(PyObject *self, visitproc visit, void *arg)
|
|||
}
|
||||
|
||||
static PyTypeObject wrappertype = {
|
||||
PyObject_HEAD_INIT(&PyType_Type)
|
||||
0, /* ob_size */
|
||||
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
||||
"method-wrapper", /* tp_name */
|
||||
sizeof(wrapperobject), /* tp_basicsize */
|
||||
0, /* tp_itemsize */
|
||||
|
|
@ -1238,8 +1231,7 @@ property_traverse(PyObject *self, visitproc visit, void *arg)
|
|||
}
|
||||
|
||||
PyTypeObject PyProperty_Type = {
|
||||
PyObject_HEAD_INIT(&PyType_Type)
|
||||
0, /* ob_size */
|
||||
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
||||
"property", /* tp_name */
|
||||
sizeof(propertyobject), /* tp_basicsize */
|
||||
0, /* tp_itemsize */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue