diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2010-12-03 20:14:31 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2010-12-03 20:14:31 (GMT) |
| commit | 4d0d471a8031de90a2b1ce99c4ac4780e60b3bc9 (patch) | |
| tree | c8f1fef715f8d158e58f17cab14af65455de1d77 /Objects/memoryobject.c | |
| parent | c4df7845143f9afe0d20f4421a41904f3cbb991a (diff) | |
| download | cpython-4d0d471a8031de90a2b1ce99c4ac4780e60b3bc9.zip cpython-4d0d471a8031de90a2b1ce99c4ac4780e60b3bc9.tar.gz cpython-4d0d471a8031de90a2b1ce99c4ac4780e60b3bc9.tar.bz2 | |
Merge branches/pep-0384.
Diffstat (limited to 'Objects/memoryobject.c')
| -rw-r--r-- | Objects/memoryobject.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c index ba9e08b..a05b97b 100644 --- a/Objects/memoryobject.c +++ b/Objects/memoryobject.c @@ -599,7 +599,7 @@ memory_subscript(PyMemoryViewObject *self, PyObject *key) else if (PySlice_Check(key)) { Py_ssize_t start, stop, step, slicelength; - if (PySlice_GetIndicesEx((PySliceObject*)key, get_shape0(view), + if (PySlice_GetIndicesEx(key, get_shape0(view), &start, &stop, &step, &slicelength) < 0) { return NULL; } @@ -678,7 +678,7 @@ memory_ass_sub(PyMemoryViewObject *self, PyObject *key, PyObject *value) else if (PySlice_Check(key)) { Py_ssize_t stop, step; - if (PySlice_GetIndicesEx((PySliceObject*)key, get_shape0(view), + if (PySlice_GetIndicesEx(key, get_shape0(view), &start, &stop, &step, &len) < 0) { return -1; } |