summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2006-04-03 04:46:04 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2006-04-03 04:46:04 (GMT)
commitd08eaf4d1b962cff39745d875f9499232defc0a8 (patch)
treee117ac4f3e0500dc90fa27c5d0eace84efe638fd
parentb902f4e401bbf5ada3494c4fb7eeab605a370e10 (diff)
downloadcpython-d08eaf4d1b962cff39745d875f9499232defc0a8.zip
cpython-d08eaf4d1b962cff39745d875f9499232defc0a8.tar.gz
cpython-d08eaf4d1b962cff39745d875f9499232defc0a8.tar.bz2
Use Py_ssize_t in slices
-rw-r--r--Objects/sliceobject.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c
index dbf2732..e33261b 100644
--- a/Objects/sliceobject.c
+++ b/Objects/sliceobject.c
@@ -107,20 +107,20 @@ PySlice_GetIndices(PySliceObject *r, Py_ssize_t length,
*step = 1;
} else {
if (!PyInt_Check(r->step)) return -1;
- *step = PyInt_AsLong(r->step);
+ *step = PyInt_AsSsize_t(r->step);
}
if (r->start == Py_None) {
*start = *step < 0 ? length-1 : 0;
} else {
if (!PyInt_Check(r->start)) return -1;
- *start = PyInt_AsLong(r->start);
+ *start = PyInt_AsSsize_t(r->start);
if (*start < 0) *start += length;
}
if (r->stop == Py_None) {
*stop = *step < 0 ? -1 : length;
} else {
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 > length) return -1;
@@ -252,7 +252,7 @@ slice_indices(PySliceObject* self, PyObject* len)
{
Py_ssize_t ilen, start, stop, step, slicelength;
- ilen = PyInt_AsLong(len);
+ ilen = PyInt_AsSsize_t(len);
if (ilen == -1 && PyErr_Occurred()) {
return NULL;
@@ -263,7 +263,7 @@ slice_indices(PySliceObject* self, PyObject* len)
return NULL;
}
- return Py_BuildValue("(iii)", start, stop, step);
+ return Py_BuildValue("(nnn)", start, stop, step);
}
PyDoc_STRVAR(slice_indices_doc,