mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Renamed _length_cue() to __length_hint__(). See:

Browse source 
http://mail.python.org/pipermail/python-dev/2006-February/060524.html
This commit is contained in:
Armin Rigo 2006-02-11 21:32:43 +00:00
parent cbcdfdc112
commit f5b3e36493
14 changed files with 41 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Objects/abstract.c
View file

@ -82,7 +82,7 @@ PyObject_Length(PyObject *o)
#define PyObject_Length PyObject_Size
int
_PyObject_LengthCue(PyObject *o)
_PyObject_LengthHint(PyObject *o)
{
int rv = PyObject_Size(o);
if (rv != -1)
@ -92,7 +92,7 @@ _PyObject_LengthCue(PyObject *o)
PyObject *err_type, *err_value, *err_tb, *ro;
PyErr_Fetch(&err_type, &err_value, &err_tb);
ro = PyObject_CallMethod(o, "_length_cue", NULL);
ro = PyObject_CallMethod(o, "__length_hint__", NULL);
if (ro != NULL) {
rv = (int)PyInt_AsLong(ro);
Py_DECREF(ro);
@ -1463,7 +1463,7 @@ PySequence_Tuple(PyObject *v)
return NULL;
/* Guess result size and allocate space. */
n = _PyObject_LengthCue(v);
n = _PyObject_LengthHint(v);
if (n < 0) {
if (!PyErr_ExceptionMatches(PyExc_TypeError) &&
!PyErr_ExceptionMatches(PyExc_AttributeError)) {

4
Objects/dictobject.c
View file

@ -2063,10 +2063,10 @@ dictiter_len(dictiterobject *di)
return PyInt_FromLong(len);
}
PyDoc_STRVAR(length_cue_doc, "Private method returning an estimate of len(list(it)).");
PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(it)).");
static PyMethodDef dictiter_methods[] = {
{"_length_cue", (PyCFunction)dictiter_len, METH_NOARGS, length_cue_doc},
{"__length_hint__", (PyCFunction)dictiter_len, METH_NOARGS, length_hint_doc},
{NULL, NULL} /* sentinel */
};

4
Objects/enumobject.c
View file

@ -252,10 +252,10 @@ reversed_len(reversedobject *ro)
return PyInt_FromLong((seqsize < position) ? 0 : position);
}
PyDoc_STRVAR(length_cue_doc, "Private method returning an estimate of len(list(it)).");
PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(it)).");
static PyMethodDef reversediter_methods[] = {
{"_length_cue", (PyCFunction)reversed_len, METH_NOARGS, length_cue_doc},
{"__length_hint__", (PyCFunction)reversed_len, METH_NOARGS, length_hint_doc},
{NULL, NULL} /* sentinel */
};

4
Objects/iterobject.c
View file

@ -87,10 +87,10 @@ iter_len(seqiterobject *it)
return PyInt_FromLong(0);
}
PyDoc_STRVAR(length_cue_doc, "Private method returning an estimate of len(list(it)).");
PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(it)).");
static PyMethodDef seqiter_methods[] = {
{"_length_cue", (PyCFunction)iter_len, METH_NOARGS, length_cue_doc},
{"__length_hint__", (PyCFunction)iter_len, METH_NOARGS, length_hint_doc},
{NULL, NULL} /* sentinel */
};

6
Objects/listobject.c
View file

@ -775,7 +775,7 @@ listextend(PyListObject *self, PyObject *b)
iternext = *it->ob_type->tp_iternext;
/* Guess a result list size. */
n = _PyObject_LengthCue(b);
n = _PyObject_LengthHint(b);
if (n < 0) {
if (!PyErr_ExceptionMatches(PyExc_TypeError) &&
!PyErr_ExceptionMatches(PyExc_AttributeError)) {
@ -2776,10 +2776,10 @@ listiter_len(listiterobject *it)
return PyInt_FromLong(0);
}
PyDoc_STRVAR(length_cue_doc, "Private method returning an estimate of len(list(it)).");
PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(it)).");
static PyMethodDef listiter_methods[] = {
{"_length_cue", (PyCFunction)listiter_len, METH_NOARGS, length_cue_doc},
{"__length_hint__", (PyCFunction)listiter_len, METH_NOARGS, length_hint_doc},
{NULL, NULL} /* sentinel */
};

4
Objects/rangeobject.c
View file

@ -268,10 +268,10 @@ rangeiter_len(rangeiterobject *r)
return PyInt_FromLong(r->len - r->index);
}
PyDoc_STRVAR(length_cue_doc, "Private method returning an estimate of len(list(it)).");
PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(it)).");
static PyMethodDef rangeiter_methods[] = {
{"_length_cue", (PyCFunction)rangeiter_len, METH_NOARGS, length_cue_doc},
{"__length_hint__", (PyCFunction)rangeiter_len, METH_NOARGS, length_hint_doc},
{NULL, NULL} /* sentinel */
};

4
Objects/setobject.c
View file

@ -758,10 +758,10 @@ setiter_len(setiterobject *si)
return PyInt_FromLong(len);
}
PyDoc_STRVAR(length_cue_doc, "Private method returning an estimate of len(list(it)).");
PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(it)).");
static PyMethodDef setiter_methods[] = {
{"_length_cue", (PyCFunction)setiter_len, METH_NOARGS, length_cue_doc},
{"__length_hint__", (PyCFunction)setiter_len, METH_NOARGS, length_hint_doc},
{NULL, NULL} /* sentinel */
};

4
Objects/tupleobject.c
View file

@ -860,10 +860,10 @@ tupleiter_len(tupleiterobject *it)
return PyInt_FromLong(len);
}
PyDoc_STRVAR(length_cue_doc, "Private method returning an estimate of len(list(it)).");
PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(it)).");
static PyMethodDef tupleiter_methods[] = {
{"_length_cue", (PyCFunction)tupleiter_len, METH_NOARGS, length_cue_doc},
{"__length_hint__", (PyCFunction)tupleiter_len, METH_NOARGS, length_hint_doc},
{NULL, NULL} /* sentinel */
};