diff options
author | Raymond Hettinger <python@rcn.com> | 2008-12-03 15:42:10 (GMT) |
---|---|---|
committer | Raymond Hettinger <python@rcn.com> | 2008-12-03 15:42:10 (GMT) |
commit | 7989a4dccb39aa954057cbc4205473f09daae84b (patch) | |
tree | 1e3d69be16c9c149eabab7d4fe3c07f13c25f236 /Objects | |
parent | fd8a1ec4863b8a53436dd45fd190b2fe3ac4b2a8 (diff) | |
download | cpython-7989a4dccb39aa954057cbc4205473f09daae84b.zip cpython-7989a4dccb39aa954057cbc4205473f09daae84b.tar.gz cpython-7989a4dccb39aa954057cbc4205473f09daae84b.tar.bz2 |
Backport r67478
Diffstat (limited to 'Objects')
-rw-r--r-- | Objects/listobject.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Objects/listobject.c b/Objects/listobject.c index e8379e1..7b4bf35 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -2911,11 +2911,11 @@ static PyObject *list_reversed(PyListObject *, PyObject *); static void listreviter_dealloc(listreviterobject *); static int listreviter_traverse(listreviterobject *, visitproc, void *); static PyObject *listreviter_next(listreviterobject *); -static Py_ssize_t listreviter_len(listreviterobject *); +static PyObject *listreviter_len(listreviterobject *); -static PySequenceMethods listreviter_as_sequence = { - (lenfunc)listreviter_len, /* sq_length */ - 0, /* sq_concat */ +static PyMethodDef listreviter_methods[] = { + {"__length_hint__", (PyCFunction)listreviter_len, METH_NOARGS, length_hint_doc}, + {NULL, NULL} /* sentinel */ }; PyTypeObject PyListRevIter_Type = { @@ -2931,7 +2931,7 @@ PyTypeObject PyListRevIter_Type = { 0, /* tp_compare */ 0, /* tp_repr */ 0, /* tp_as_number */ - &listreviter_as_sequence, /* tp_as_sequence */ + 0, /* tp_as_sequence */ 0, /* tp_as_mapping */ 0, /* tp_hash */ 0, /* tp_call */ @@ -2947,6 +2947,7 @@ PyTypeObject PyListRevIter_Type = { 0, /* tp_weaklistoffset */ PyObject_SelfIter, /* tp_iter */ (iternextfunc)listreviter_next, /* tp_iternext */ + listreviter_methods, /* tp_methods */ 0, }; @@ -3002,11 +3003,11 @@ listreviter_next(listreviterobject *it) return NULL; } -static Py_ssize_t +static PyObject * listreviter_len(listreviterobject *it) { Py_ssize_t len = it->it_index + 1; if (it->it_seq == NULL || PyList_GET_SIZE(it->it_seq) < len) - return 0; - return len; + len = 0; + return PyLong_FromSsize_t(len); } |