Commit b126c076 authored by Tres Seaver's avatar Tres Seaver

Avoid in-place mutation of maybe-lists.

parent ec78fcbb
...@@ -277,12 +277,10 @@ class MappingBase(Base): ...@@ -277,12 +277,10 @@ class MappingBase(Base):
t[99-x] = x t[99-x] = x
for x in range(40): for x in range(40):
lst = list(t.values(0+x,99-x)) lst = sorted(t.values(0+x,99-x))
lst.sort()
self.assertEqual(lst,range(0+x,99-x+1)) self.assertEqual(lst,range(0+x,99-x+1))
lst = list(t.values(max=99-x, min=0+x)) lst = sorted(t.values(max=99-x, min=0+x))
lst.sort()
self.assertEqual(lst,range(0+x,99-x+1)) self.assertEqual(lst,range(0+x,99-x+1))
def testValuesNegativeIndex(self): def testValuesNegativeIndex(self):
...@@ -290,7 +288,7 @@ class MappingBase(Base): ...@@ -290,7 +288,7 @@ class MappingBase(Base):
L = [-3, 6, -11, 4] L = [-3, 6, -11, 4]
for i in L: for i in L:
t[i] = i t[i] = i
L.sort() L = sorted(L)
vals = t.values() vals = t.values()
for i in range(-1, -5, -1): for i in range(-1, -5, -1):
self.assertEqual(vals[i], L[i]) self.assertEqual(vals[i], L[i])
...@@ -321,7 +319,7 @@ class MappingBase(Base): ...@@ -321,7 +319,7 @@ class MappingBase(Base):
L = [-3, 6, -11, 4] L = [-3, 6, -11, 4]
for i in L: for i in L:
t[i] = i t[i] = i
L.sort() L = sorted(L)
keys = t.keys() keys = t.keys()
for i in range(-1, -5, -1): for i in range(-1, -5, -1):
self.assertEqual(keys[i], L[i]) self.assertEqual(keys[i], L[i])
...@@ -355,7 +353,7 @@ class MappingBase(Base): ...@@ -355,7 +353,7 @@ class MappingBase(Base):
L = [-3, 6, -11, 4] L = [-3, 6, -11, 4]
for i in L: for i in L:
t[i] = i t[i] = i
L.sort() L = sorted(L)
items = t.items() items = t.items()
for i in range(-1, -5, -1): for i in range(-1, -5, -1):
self.assertEqual(items[i], (L[i], L[i])) self.assertEqual(items[i], (L[i], L[i]))
...@@ -421,8 +419,7 @@ class MappingBase(Base): ...@@ -421,8 +419,7 @@ class MappingBase(Base):
d[k]=i d[k]=i
l.append((k, i)) l.append((k, i))
items=d.items() items= sorted(d.items())
items.sort()
t.update(d) t.update(d)
self.assertEqual(list(t.items()), items) self.assertEqual(list(t.items()), items)
...@@ -836,8 +833,7 @@ class BTreeTests(MappingBase): ...@@ -836,8 +833,7 @@ class BTreeTests(MappingBase):
if not added.has_key(k): if not added.has_key(k):
t[k] = x t[k] = x
added[k] = 1 added[k] = 1
addl = added.keys() addl = sorted(added.keys())
addl.sort()
diff = lsubtract(list(t.keys()), addl) diff = lsubtract(list(t.keys()), addl)
self.assertEqual(diff , [], (diff, addl, list(t.keys()))) self.assertEqual(diff , [], (diff, addl, list(t.keys())))
self._checkIt(t) self._checkIt(t)
...@@ -851,8 +847,7 @@ class BTreeTests(MappingBase): ...@@ -851,8 +847,7 @@ class BTreeTests(MappingBase):
k = random.choice(r) k = random.choice(r)
t[k] = x t[k] = x
added[k] = 1 added[k] = 1
addl = added.keys() addl = sorted(added.keys())
addl.sort()
diff = lsubtract(t.keys(), addl) diff = lsubtract(t.keys(), addl)
self.assertEqual(diff , [], diff) self.assertEqual(diff , [], diff)
self._checkIt(t) self._checkIt(t)
...@@ -911,8 +906,7 @@ class BTreeTests(MappingBase): ...@@ -911,8 +906,7 @@ class BTreeTests(MappingBase):
def testPathologicalLeftBranching(self): def testPathologicalLeftBranching(self):
t = self._makeOne() t = self._makeOne()
r = range(1000) r = range(1000)
revr = r[:] revr = list(reversed(r[:]))
revr.reverse()
for x in revr: for x in revr:
t[x] = 1 t[x] = 1
self.assertEqual(realseq(t.keys()) , r, realseq(t.keys())) self.assertEqual(realseq(t.keys()) , r, realseq(t.keys()))
...@@ -1173,8 +1167,7 @@ class NormalSetTests(Base): ...@@ -1173,8 +1167,7 @@ class NormalSetTests(Base):
d[k]=i d[k]=i
l.append(k) l.append(k)
items = d.keys() items = sorted(d.keys())
items.sort()
t.update(l) t.update(l)
self.assertEqual(list(t.keys()), items) self.assertEqual(list(t.keys()), items)
...@@ -1486,8 +1479,7 @@ class TestLongIntValues(TestLongIntSupport): ...@@ -1486,8 +1479,7 @@ class TestLongIntValues(TestLongIntSupport):
if not using64bits: if not using64bits:
return return
t = self._makeOne() t = self._makeOne()
keys = list(self.getTwoKeys()) keys = sorted(self.getTwoKeys())
keys.sort()
k1, k2 = keys k1, k2 = keys
assert k1 != k2 assert k1 != k2
...@@ -1538,8 +1530,7 @@ class SetResult(object): ...@@ -1538,8 +1530,7 @@ class SetResult(object):
for e in y: for e in y:
if e not in result: if e not in result:
result.append(e) result.append(e)
result.sort() return sorted(result)
return result
def _intersection(self, x, y): def _intersection(self, x, y):
result = [] result = []
...@@ -1815,10 +1806,8 @@ class MultiUnion(object): ...@@ -1815,10 +1806,8 @@ class MultiUnion(object):
def testOne(self): def testOne(self):
for sequence in [3], range(20), range(-10, 0, 2) + range(1, 10, 2): for sequence in [3], range(20), range(-10, 0, 2) + range(1, 10, 2):
seq1 = sequence[:] seq1 = sequence[:]
seq2 = sequence[:] seq2 = list(reversed(sequence[:]))
seq2.reverse() seqsorted = sorted(sequence[:])
seqsorted = sequence[:]
seqsorted.sort()
for seq in seq1, seq2, seqsorted: for seq in seq1, seq2, seqsorted:
for builder in self.mkset, self.mktreeset: for builder in self.mkset, self.mktreeset:
input = builder(seq) input = builder(seq)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment