summaryrefslogtreecommitdiffstats
path: root/Objects/memoryobject.c
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2017-04-08 08:18:14 (GMT)
committerGitHub <noreply@github.com>2017-04-08 08:18:14 (GMT)
commitc26b19d5c7aba51b50a4d7fb5f8291036cb9da24 (patch)
treeafe2017c8c588609b61527577666e340c36fe485 /Objects/memoryobject.c
parentd0d575a6db8cb3b2a720be9f404af3d754da9a5d (diff)
downloadcpython-c26b19d5c7aba51b50a4d7fb5f8291036cb9da24.zip
cpython-c26b19d5c7aba51b50a4d7fb5f8291036cb9da24.tar.gz
cpython-c26b19d5c7aba51b50a4d7fb5f8291036cb9da24.tar.bz2
Expand the PySlice_GetIndicesEx macro. (#1023) (#1044)
(cherry picked from commit b879fe82e7e5c3f7673c9a7fa4aad42bd05445d8)
Diffstat (limited to 'Objects/memoryobject.c')
-rw-r--r--Objects/memoryobject.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c
index b1798a2..e1ac728 100644
--- a/Objects/memoryobject.c
+++ b/Objects/memoryobject.c
@@ -2285,10 +2285,10 @@ init_slice(Py_buffer *base, PyObject *key, int dim)
{
Py_ssize_t start, stop, step, slicelength;
- if (PySlice_GetIndicesEx(key, base->shape[dim],
- &start, &stop, &step, &slicelength) < 0) {
+ if (PySlice_Unpack(key, &start, &stop, &step) < 0) {
return -1;
}
+ slicelength = PySlice_AdjustIndices(base->shape[dim], &start, &stop, step);
if (base->suboffsets == NULL || dim == 0) {