mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-05 22:51:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Expand the PySlice_GetIndicesEx macro. (#1023) (#1044)

Browse source 
(cherry picked from commit b879fe82e7)
This commit is contained in:
Serhiy Storchaka 2017-04-08 11:18:14 +03:00 • committed by GitHub
parent d0d575a6db
commit c26b19d5c7
11 changed files with 47 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Objects/listobject.c
View file

@ -2420,10 +2420,11 @@ list_subscript(PyListObject* self, PyObject* item)
PyObject* it;
PyObject **src, **dest;
if (PySlice_GetIndicesEx(item, Py_SIZE(self),
&start, &stop, &step, &slicelength) < 0) {
if (PySlice_Unpack(item, &start, &stop, &step) < 0) {
return NULL;
}
slicelength = PySlice_AdjustIndices(Py_SIZE(self), &start, &stop,
step);
if (slicelength <= 0) {
return PyList_New(0);
@ -2469,10 +2470,11 @@ list_ass_subscript(PyListObject* self, PyObject* item, PyObject* value)
else if (PySlice_Check(item)) {
Py_ssize_t start, stop, step, slicelength;
if (PySlice_GetIndicesEx(item, Py_SIZE(self),
&start, &stop, &step, &slicelength) < 0) {
if (PySlice_Unpack(item, &start, &stop, &step) < 0) {
return -1;
}
slicelength = PySlice_AdjustIndices(Py_SIZE(self), &start, &stop,
step);
if (step == 1)
return list_ass_slice(self, start, stop, value);