commit c26b19d5c7aba51b50a4d7fb5f8291036cb9da24
author Serhiy Storchaka <storchaka@gmail.com> Sat Apr 08 11:18:14 2017 +0300
committer GitHub <noreply@github.com> Sat Apr 08 11:18:14 2017 +0300
tree afe2017c8c588609b61527577666e340c36fe485
parent d0d575a6db8cb3b2a720be9f404af3d754da9a5d

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

(cherry picked from commit b879fe82e7e5c3f7673c9a7fa4aad42bd05445d8)

Objects/unicodeobject.c

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index a5ae454..949205a 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -13915,10 +13915,11 @@
         int src_kind, dest_kind;
         Py_UCS4 ch, max_char, kind_limit;
 
-        if (PySlice_GetIndicesEx(item, PyUnicode_GET_LENGTH(self),
-                                 &start, &stop, &step, &slicelength) < 0) {
+        if (PySlice_Unpack(item, &start, &stop, &step) < 0) {
             return NULL;
         }
+        slicelength = PySlice_AdjustIndices(PyUnicode_GET_LENGTH(self),
+                                            &start, &stop, step);
 
         if (slicelength <= 0) {
             _Py_RETURN_UNICODE_EMPTY();