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

Merge branches/pep-0384.

Browse source
This commit is contained in:
Martin v. Löwis 2010-12-03 20:14:31 +00:00
parent c4df784514
commit 4d0d471a80
102 changed files with 2835 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Objects/rangeobject.c
View file

@ -431,7 +431,6 @@ range_subscript(rangeobject* self, PyObject* item)
return range_item(self, i);
}
if (PySlice_Check(item)) {
PySliceObject *slice = (PySliceObject*)item;
Py_ssize_t start, stop, step, len, rlen;
rangeobject *result;
PyObject *substart = NULL, *substep = NULL, *substop = NULL;
@ -441,7 +440,7 @@ range_subscript(rangeobject* self, PyObject* item)
return NULL;
}
if (PySlice_GetIndicesEx(slice, rlen,
if (PySlice_GetIndicesEx(item, rlen,
&start, &stop, &step, &len) < 0) {
return NULL;
}
@ -450,7 +449,7 @@ range_subscript(rangeobject* self, PyObject* item)
Py_INCREF(substep);
} else {
/* NB: slice step != Py_None here */
substep = PyNumber_Multiply(self->step, slice->step);
substep = PyNumber_Multiply(self->step, ((PySliceObject*)item)->step);
if (substep == NULL)
goto fail;
}