Commit d08eaf4d authored by Neal Norwitz's avatar Neal Norwitz

Use Py_ssize_t in slices

parent b902f4e4
...@@ -107,20 +107,20 @@ PySlice_GetIndices(PySliceObject *r, Py_ssize_t length, ...@@ -107,20 +107,20 @@ PySlice_GetIndices(PySliceObject *r, Py_ssize_t length,
*step = 1; *step = 1;
} else { } else {
if (!PyInt_Check(r->step)) return -1; if (!PyInt_Check(r->step)) return -1;
*step = PyInt_AsLong(r->step); *step = PyInt_AsSsize_t(r->step);
} }
if (r->start == Py_None) { if (r->start == Py_None) {
*start = *step < 0 ? length-1 : 0; *start = *step < 0 ? length-1 : 0;
} else { } else {
if (!PyInt_Check(r->start)) return -1; if (!PyInt_Check(r->start)) return -1;
*start = PyInt_AsLong(r->start); *start = PyInt_AsSsize_t(r->start);
if (*start < 0) *start += length; if (*start < 0) *start += length;
} }
if (r->stop == Py_None) { if (r->stop == Py_None) {
*stop = *step < 0 ? -1 : length; *stop = *step < 0 ? -1 : length;
} else { } else {
if (!PyInt_Check(r->stop)) return -1; if (!PyInt_Check(r->stop)) return -1;
*stop = PyInt_AsLong(r->stop); *stop = PyInt_AsSsize_t(r->stop);
if (*stop < 0) *stop += length; if (*stop < 0) *stop += length;
} }
if (*stop > length) return -1; if (*stop > length) return -1;
...@@ -252,7 +252,7 @@ slice_indices(PySliceObject* self, PyObject* len) ...@@ -252,7 +252,7 @@ slice_indices(PySliceObject* self, PyObject* len)
{ {
Py_ssize_t ilen, start, stop, step, slicelength; Py_ssize_t ilen, start, stop, step, slicelength;
ilen = PyInt_AsLong(len); ilen = PyInt_AsSsize_t(len);
if (ilen == -1 && PyErr_Occurred()) { if (ilen == -1 && PyErr_Occurred()) {
return NULL; return NULL;
...@@ -263,7 +263,7 @@ slice_indices(PySliceObject* self, PyObject* len) ...@@ -263,7 +263,7 @@ slice_indices(PySliceObject* self, PyObject* len)
return NULL; return NULL;
} }
return Py_BuildValue("(iii)", start, stop, step); return Py_BuildValue("(nnn)", start, stop, step);
} }
PyDoc_STRVAR(slice_indices_doc, PyDoc_STRVAR(slice_indices_doc,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment