| commit | 4d0d471a8031de90a2b1ce99c4ac4780e60b3bc9 | [log] [tgz] |
|---|---|---|
| author | Martin v. Löwis <martin@v.loewis.de> | Fri Dec 03 20:14:31 2010 +0000 |
| committer | Martin v. Löwis <martin@v.loewis.de> | Fri Dec 03 20:14:31 2010 +0000 |
| tree | c8f1fef715f8d158e58f17cab14af65455de1d77 | |
| parent | c4df7845143f9afe0d20f4421a41904f3cbb991a [diff] [blame] |
Merge branches/pep-0384.
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c index d3b8a4f..4aa0748 100644 --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c
@@ -911,7 +911,7 @@ char* result_buf; PyObject* result; - if (PySlice_GetIndicesEx((PySliceObject*)item, + if (PySlice_GetIndicesEx(item, PyBytes_GET_SIZE(self), &start, &stop, &step, &slicelength) < 0) { return NULL;