commit e41390aca51e4e3eb455cf3b70f5d656a2814db9
author Serhiy Storchaka <storchaka@gmail.com> Sat Apr 08 11:48:57 2017 +0300
committer GitHub <noreply@github.com> Sat Apr 08 11:48:57 2017 +0300
tree e90f8b0b47ec38d5dc7871b4e5b0f944c46473a4
parent 7f85947106aff5b1f166a57f644f987db4d38bf0

bpo-27867: Expand the PySlice_GetIndicesEx macro. (#1023) (#1046)

(cherry picked from commit b879fe8)

Objects/memoryobject.c

diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c
index 2bac266..12be12b 100644
--- a/Objects/memoryobject.c
+++ b/Objects/memoryobject.c
@@ -584,10 +584,11 @@
     else if (PySlice_Check(key)) {
         Py_ssize_t start, stop, step, slicelength;
 
-        if (PySlice_GetIndicesEx((PySliceObject*)key, get_shape0(view),
-                                 &start, &stop, &step, &slicelength) < 0) {
+        if (_PySlice_Unpack((PySliceObject *)key, &start, &stop, &step) < 0) {
             return NULL;
         }
+        slicelength = _PySlice_AdjustIndices(get_shape0(view), &start, &stop,
+                                            step);
     
         if (step == 1 && view->ndim == 1) {
             Py_buffer newview;
@@ -662,10 +663,10 @@
     else if (PySlice_Check(key)) {
         Py_ssize_t stop, step;
 
-        if (PySlice_GetIndicesEx((PySliceObject*)key, get_shape0(view),
-                         &start, &stop, &step, &len) < 0) {
+        if (_PySlice_Unpack((PySliceObject *)key, &start, &stop, &step) < 0) {
             return -1;
         }
+        len = _PySlice_AdjustIndices(get_shape0(view), &start, &stop, step);
         if (step != 1) {
             PyErr_SetNone(PyExc_NotImplementedError);
             return -1;