1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for problem reported by Neal Norwitz. Tighten up calculation of

Browse Source 
slicelength.  Include his test case.
This commit is contained in:
Michael W. Hudson 2002-06-11 13:38:42 +00:00
parent 75a20b19ef
commit 589dc93620
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/test/test_types.py
View File

@ -374,6 +374,8 @@ vereq(a[3::-2], [3,1])
vereq(a[-100:100:], a)
vereq(a[100:-100:-1], a[::-1])
vereq(a[-100L:100L:2L], [0,2,4])
vereq(a[1000:2000:2], [])
vereq(a[-1000:-2000:-2], [])
# deletion
del a[::2]
vereq(a, [1,3])

8
Objects/sliceobject.c
View File

@ -151,13 +151,15 @@ PySlice_GetIndicesEx(PySliceObject *r, int length,
if (*stop < 0) *stop = -1;
if (*stop > length) *stop = length;
}
if (*step < 0) {
if ((*stop - *start)*(*step) <= 0) {
*slicelength = 0;
}
else if (*step < 0) {
*slicelength = (*stop-*start+1)/(*step)+1;
} else {
*slicelength = (*stop-*start-1)/(*step)+1;
}
if (*slicelength < 0) *slicelength = 0;
return 0;
}