Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-01-11 12:42:34 +01:00
Code Issues Projects Releases Wiki Activity

Removed sliceIndices and replaced all uses with slice.indices. Yay 2.3

Browse Source
This commit is contained in:
Jeremy Fincher 2003-08-19 10:41:19 +00:00
parent 7fd35a1071
commit 230020ad5f
1 changed files with 5 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/structures.py
View File

@ -94,7 +94,7 @@ class RingBuffer(object):
oidx = idx oidx = idx
if type(oidx) == types.SliceType: if type(oidx) == types.SliceType:
L = [] L = []
for i in xrange(*sliceIndices(oidx, len(self))): for i in xrange(*slice.indices(oidx, len(self))):
L.append(self[i]) L.append(self[i])
return L return L
else: else:
@ -106,7 +106,7 @@ class RingBuffer(object):
else: else:
if type(idx) == types.SliceType: if type(idx) == types.SliceType:
L = [] L = []
for i in xrange(*sliceIndices(idx, len(self))): for i in xrange(*slice.indices(idx, len(self))):
L.append(self[i]) L.append(self[i])
return L return L
else: else:
@ -116,7 +116,7 @@ class RingBuffer(object):
if self.full: if self.full:
oidx = idx oidx = idx
if type(oidx) == types.SliceType: if type(oidx) == types.SliceType:
range = xrange(*sliceIndices(oidx, len(self))) range = xrange(*slice.indices(oidx, len(self)))
if len(range) != len(elt): if len(range) != len(elt):
raise ValueError, 'seq must be the same length as slice.' raise ValueError, 'seq must be the same length as slice.'
else: else:
@ -130,7 +130,7 @@ class RingBuffer(object):
self.L[idx] = elt self.L[idx] = elt
else: else:
if type(idx) == types.SliceType: if type(idx) == types.SliceType:
range = xrange(*sliceIndices(idx, len(self))) range = xrange(*slice.indices(idx, len(self)))
if len(range) != len(elt): if len(range) != len(elt):
raise ValueError, 'seq must be the same length as slice.' raise ValueError, 'seq must be the same length as slice.'
else: else:
@ -215,7 +215,7 @@ class queue(object):
raise IndexError, 'queue index out of range' raise IndexError, 'queue index out of range'
if type(oidx) == types.SliceType: if type(oidx) == types.SliceType:
L = [] L = []
for i in xrange(*sliceIndices(oidx, len(self))): for i in xrange(*slice.indices(oidx, len(self))):
L.append(self[i]) L.append(self[i])
return L return L
else: else:
@ -295,52 +295,3 @@ class MaxLengthQueue(queue):
## enqueue = RingBuffer.append ## enqueue = RingBuffer.append
## def peek(self): ## def peek(self):
## return self[0] ## return self[0]
def sliceIndices(slice, length):
if slice.step is None:
step = 1
else:
if slice.step == 0:
raise ValueError, 'slice step cannot be zero'
step = slice.step
if step < 0:
defstart = length - 1
defstop = -1
else:
defstart = 0
defstop = length
if slice.start is None:
start = defstart
else:
start = slice.start
if start < 0:
start += length
if start < 0:
if step < 0:
start = -1
else:
start = 0
if start >= length:
if step < 0:
start = length - 1
else:
start = length
if slice.stop is None:
stop = defstop
else:
stop = slice.stop
if stop < 0:
stop += length
if stop < 0:
stop = -1
if stop > length:
stop = length
if (step < 0 and stop >= start) or \
(step > 0 and start >= stop):
slicelength = 0
elif step < 0:
slicelength = (stop - start + 1)/step + 1
else:
slicelength = (stop - start - 1)/step + 1
return (start, stop, step)