mirror of
https://github.com/python/cpython.git
synced 2025-07-24 11:44:31 +00:00
Fix the bug described in
http://mail.python.org/pipermail/python-dev/2002-June/025461.html with test cases. Also includes extended slice support for arrays, which I thought I'd already checked in but obviously not.
This commit is contained in:
parent
fe0ca4a0f5
commit
9c14badc5f
4 changed files with 233 additions and 7 deletions
|
@ -1757,9 +1757,13 @@ list_ass_subscript(PyListObject* self, PyObject* item, PyObject* value)
|
|||
return -1;
|
||||
}
|
||||
|
||||
/* treat L[slice(a,b)] = v _exactly_ like L[a:b] = v */
|
||||
if (step == 1 && ((PySliceObject*)item)->step == Py_None)
|
||||
return list_ass_slice(self, start, stop, value);
|
||||
|
||||
if (value == NULL) {
|
||||
/* delete slice */
|
||||
PyObject **garbage, **item;
|
||||
PyObject **garbage, **it;
|
||||
int cur, i, j;
|
||||
|
||||
if (slicelength <= 0)
|
||||
|
@ -1788,15 +1792,15 @@ list_ass_subscript(PyListObject* self, PyObject* item, PyObject* value)
|
|||
cur + j + 1));
|
||||
}
|
||||
}
|
||||
for (cur = start + slicelength*step + 1;
|
||||
for (cur = start + slicelength*step + 1;
|
||||
cur < self->ob_size; cur++) {
|
||||
PyList_SET_ITEM(self, cur - slicelength,
|
||||
PyList_GET_ITEM(self, cur));
|
||||
}
|
||||
self->ob_size -= slicelength;
|
||||
item = self->ob_item;
|
||||
NRESIZE(item, PyObject*, self->ob_size);
|
||||
self->ob_item = item;
|
||||
it = self->ob_item;
|
||||
NRESIZE(it, PyObject*, self->ob_size);
|
||||
self->ob_item = it;
|
||||
|
||||
for (i = 0; i < slicelength; i++) {
|
||||
Py_DECREF(garbage[i]);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue