mirror of
https://github.com/python/cpython.git
synced 2025-11-25 04:34:37 +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
|
|
@ -670,8 +670,7 @@ multibytecodec_dealloc(MultibyteCodecObject *self)
|
|||
}
|
||||
|
||||
static PyTypeObject MultibyteCodec_Type = {
|
||||
PyObject_HEAD_INIT(NULL)
|
||||
0, /* ob_size */
|
||||
PyVarObject_HEAD_INIT(NULL, 0)
|
||||
"MultibyteCodec", /* tp_name */
|
||||
sizeof(MultibyteCodecObject), /* tp_basicsize */
|
||||
0, /* tp_itemsize */
|
||||
|
|
@ -946,12 +945,11 @@ mbiencoder_dealloc(MultibyteIncrementalEncoderObject *self)
|
|||
{
|
||||
PyObject_GC_UnTrack(self);
|
||||
ERROR_DECREF(self->errors);
|
||||
self->ob_type->tp_free(self);
|
||||
Py_Type(self)->tp_free(self);
|
||||
}
|
||||
|
||||
static PyTypeObject MultibyteIncrementalEncoder_Type = {
|
||||
PyObject_HEAD_INIT(NULL)
|
||||
0, /* ob_size */
|
||||
PyVarObject_HEAD_INIT(NULL, 0)
|
||||
"MultibyteIncrementalEncoder", /* tp_name */
|
||||
sizeof(MultibyteIncrementalEncoderObject), /* tp_basicsize */
|
||||
0, /* tp_itemsize */
|
||||
|
|
@ -1147,12 +1145,11 @@ mbidecoder_dealloc(MultibyteIncrementalDecoderObject *self)
|
|||
{
|
||||
PyObject_GC_UnTrack(self);
|
||||
ERROR_DECREF(self->errors);
|
||||
self->ob_type->tp_free(self);
|
||||
Py_Type(self)->tp_free(self);
|
||||
}
|
||||
|
||||
static PyTypeObject MultibyteIncrementalDecoder_Type = {
|
||||
PyObject_HEAD_INIT(NULL)
|
||||
0, /* ob_size */
|
||||
PyVarObject_HEAD_INIT(NULL, 0)
|
||||
"MultibyteIncrementalDecoder", /* tp_name */
|
||||
sizeof(MultibyteIncrementalDecoderObject), /* tp_basicsize */
|
||||
0, /* tp_itemsize */
|
||||
|
|
@ -1464,12 +1461,11 @@ mbstreamreader_dealloc(MultibyteStreamReaderObject *self)
|
|||
PyObject_GC_UnTrack(self);
|
||||
ERROR_DECREF(self->errors);
|
||||
Py_DECREF(self->stream);
|
||||
self->ob_type->tp_free(self);
|
||||
Py_Type(self)->tp_free(self);
|
||||
}
|
||||
|
||||
static PyTypeObject MultibyteStreamReader_Type = {
|
||||
PyObject_HEAD_INIT(NULL)
|
||||
0, /* ob_size */
|
||||
PyVarObject_HEAD_INIT(NULL, 0)
|
||||
"MultibyteStreamReader", /* tp_name */
|
||||
sizeof(MultibyteStreamReaderObject), /* tp_basicsize */
|
||||
0, /* tp_itemsize */
|
||||
|
|
@ -1667,7 +1663,7 @@ mbstreamwriter_dealloc(MultibyteStreamWriterObject *self)
|
|||
PyObject_GC_UnTrack(self);
|
||||
ERROR_DECREF(self->errors);
|
||||
Py_DECREF(self->stream);
|
||||
self->ob_type->tp_free(self);
|
||||
Py_Type(self)->tp_free(self);
|
||||
}
|
||||
|
||||
static struct PyMethodDef mbstreamwriter_methods[] = {
|
||||
|
|
@ -1688,8 +1684,7 @@ static PyMemberDef mbstreamwriter_members[] = {
|
|||
};
|
||||
|
||||
static PyTypeObject MultibyteStreamWriter_Type = {
|
||||
PyObject_HEAD_INIT(NULL)
|
||||
0, /* ob_size */
|
||||
PyVarObject_HEAD_INIT(NULL, 0)
|
||||
"MultibyteStreamWriter", /* tp_name */
|
||||
sizeof(MultibyteStreamWriterObject), /* tp_basicsize */
|
||||
0, /* tp_itemsize */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue