mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-25 09:50:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Remove the tp_print handler.

Browse source 
Revise the tp_repr handler to produce a more "minimal" presentation.
Make the tolist() method use PyArg_ParseTuple() and provide a docstring.
This commit is contained in:
Fred Drake 2000-08-03 17:43:02 +00:00
parent fd342bf453
commit 2b83b4601f
1 changed files with 27 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

58
Objects/rangeobject.c
View file

@ -58,36 +58,30 @@ range_length(rangeobject *r)
return r->len * r->reps; return r->len * r->reps;
} }
static int
range_print(rangeobject *r, FILE *fp, int flags)
{
int i, j;
fprintf(fp, "(");
for (i = 0; i < r->reps; ++i)
for (j = 0; j < r->len; ++j) {
if (j > 0 || i > 0)
fprintf(fp, ", ");
fprintf(fp, "%ld", r->start + j * r->step);
}
if (r->len == 1 && r->reps == 1)
fprintf(fp, ",");
fprintf(fp, ")");
return 0;
}
static PyObject * static PyObject *
range_repr(rangeobject *r) range_repr(rangeobject *r)
{ {
char buf[80]; char buf1[80];
sprintf(buf, "(xrange(%ld, %ld, %ld) * %d)", char buf2[80];
r->start,
r->start + r->len * r->step, if (r->start == 0 && r->step == 1) {
r->step, snprintf(buf1, sizeof(buf1), "xrange(%ld)",
r->reps); r->start + r->len * r->step);
return PyString_FromString(buf); }
else {
char *fmt = "xrange(%ld, %ld, %ld)";
if (r->step == 1)
fmt = "xrange(%ld, %ld)";
snprintf(buf1, sizeof(buf1), fmt,
r->start,
r->start + r->len * r->step,
r->step);
}
if (r->reps != 1) {
snprintf(buf2, sizeof(buf2),
"(%s * %d)", buf1, r->reps);
}
return PyString_FromString(r->reps == 1 ? buf1 : buf2);
} }
static PyObject * static PyObject *
@ -170,7 +164,7 @@ range_tolist(rangeobject *self, PyObject *args)
int j; int j;
int len = self->len * self->reps; int len = self->len * self->reps;
if (! PyArg_Parse(args, "")) if (! PyArg_ParseTuple(args, ":tolist"))
return NULL; return NULL;
if ((thelist = PyList_New(len)) == NULL) if ((thelist = PyList_New(len)) == NULL)
@ -188,7 +182,9 @@ static PyObject *
range_getattr(rangeobject *r, char *name) range_getattr(rangeobject *r, char *name)
{ {
static PyMethodDef range_methods[] = { static PyMethodDef range_methods[] = {
{"tolist", (PyCFunction)range_tolist}, {"tolist", (PyCFunction)range_tolist, METH_VARARGS,
"tolist() -> list\n"
"Return a list object with the same values."},
{NULL, NULL} {NULL, NULL}
}; };
@ -228,11 +224,11 @@ PyTypeObject PyRange_Type = {
sizeof(rangeobject), /* Basic object size */ sizeof(rangeobject), /* Basic object size */
0, /* Item size for varobject */ 0, /* Item size for varobject */
(destructor)range_dealloc, /*tp_dealloc*/ (destructor)range_dealloc, /*tp_dealloc*/
(printfunc)range_print, /*tp_print*/ 0, /*tp_print*/
(getattrfunc)range_getattr, /*tp_getattr*/ (getattrfunc)range_getattr, /*tp_getattr*/
0, /*tp_setattr*/ 0, /*tp_setattr*/
(cmpfunc)range_compare, /*tp_compare*/ (cmpfunc)range_compare, /*tp_compare*/
(reprfunc)range_repr, /*tp_repr*/ (reprfunc)range_repr, /*tp_repr*/
0, /*tp_as_number*/ 0, /*tp_as_number*/
&range_as_sequence, /*tp_as_sequence*/ &range_as_sequence, /*tp_as_sequence*/
0, /*tp_as_mapping*/ 0, /*tp_as_mapping*/