diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2007-07-21 06:55:02 +0000 |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2007-07-21 06:55:02 +0000 |
| commit | 6819210b9e4e5719a6f7f9c1725f8fa70a8936f6 (patch) | |
| tree | 456e2e6b3d9d71e966f3b0e419ecfe44ce3c1fdd /Objects/sliceobject.c | |
| parent | b1994b4a5d0139a010eb0af1d6615a3df92fe786 (diff) | |
| download | cpython-git-6819210b9e4e5719a6f7f9c1725f8fa70a8936f6.tar.gz | |
PEP 3123: Provide forward compatibility with Python 3.0, while keeping
backwards compatibility. Add Py_Refcnt, Py_Type, Py_Size, and
PyVarObject_HEAD_INIT.
Diffstat (limited to 'Objects/sliceobject.c')
| -rw-r--r-- | Objects/sliceobject.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c index 3fb1430308..d147bce26a 100644 --- a/Objects/sliceobject.c +++ b/Objects/sliceobject.c @@ -23,8 +23,7 @@ ellipsis_repr(PyObject *op) } static PyTypeObject PyEllipsis_Type = { - PyObject_HEAD_INIT(&PyType_Type) - 0, /* ob_size */ + PyVarObject_HEAD_INIT(&PyType_Type, 0) "ellipsis", /* tp_name */ 0, /* tp_basicsize */ 0, /* tp_itemsize */ @@ -47,7 +46,8 @@ static PyTypeObject PyEllipsis_Type = { }; PyObject _Py_EllipsisObject = { - PyObject_HEAD_INIT(&PyEllipsis_Type) + _PyObject_EXTRA_INIT + 1, &PyEllipsis_Type }; @@ -277,7 +277,7 @@ handling of normal slices."); static PyObject * slice_reduce(PySliceObject* self) { - return Py_BuildValue("O(OOO)", self->ob_type, self->start, self->stop, self->step); + return Py_BuildValue("O(OOO)", Py_Type(self), self->start, self->stop, self->step); } PyDoc_STRVAR(reduce_doc, "Return state information for pickling."); @@ -319,8 +319,7 @@ slice_hash(PySliceObject *v) } PyTypeObject PySlice_Type = { - PyObject_HEAD_INIT(&PyType_Type) - 0, /* Number of items for varobject */ + PyVarObject_HEAD_INIT(&PyType_Type, 0) "slice", /* Name of this type */ sizeof(PySliceObject), /* Basic object size */ 0, /* Item size for varobject */ |