[Checkins] SVN: BTrees/branches/py3k/ Dodge more bullets down-range.
Tres Seaver
cvs-admin at zope.org
Mon Dec 10 23:13:47 UTC 2012
Log message for revision 128579:
Dodge more bullets down-range.
Changed:
_U BTrees/branches/py3k/
U BTrees/branches/py3k/BTrees/tests/common.py
U BTrees/branches/py3k/BTrees/tests/test__base.py
-=-
Modified: BTrees/branches/py3k/BTrees/tests/common.py
===================================================================
--- BTrees/branches/py3k/BTrees/tests/common.py 2012-12-10 23:13:46 UTC (rev 128578)
+++ BTrees/branches/py3k/BTrees/tests/common.py 2012-12-10 23:13:47 UTC (rev 128579)
@@ -243,7 +243,7 @@
import random
t = self._makeOne()
added = {}
- r = range(1000)
+ r = list(range(1000))
for x in r:
k = random.choice(r)
t[k] = x
@@ -404,7 +404,7 @@
def testClear(self):
import random
t = self._makeOne()
- r = range(100)
+ r = list(range(100))
for x in r:
rnd = random.choice(r)
t[rnd] = 0
@@ -1225,7 +1225,7 @@
# Test whole-structure slices.
x = kslice[:]
- self.assertEqual(list(x), keys[:])
+ self.assertEqual(list(x), list(keys[:]))
for lo in range(-2*n, 2*n+1):
# Test one-sided slices.
@@ -1237,12 +1237,12 @@
for hi in range(-2*n, 2*n+1):
# Test two-sided slices.
x = kslice[lo:hi]
- self.assertEqual(list(x), keys[lo:hi])
+ self.assertEqual(list(x), list(keys[lo:hi]))
def testIterator(self):
t = self._makeOne()
- for keys in [], [-2], [1, 4], range(-170, 2000, 6):
+ for keys in [], [-2], [1, 4], list(range(-170, 2000, 6)):
t.clear()
t.update(keys)
Modified: BTrees/branches/py3k/BTrees/tests/test__base.py
===================================================================
--- BTrees/branches/py3k/BTrees/tests/test__base.py 2012-12-10 23:13:46 UTC (rev 128578)
+++ BTrees/branches/py3k/BTrees/tests/test__base.py 2012-12-10 23:13:47 UTC (rev 128579)
@@ -640,7 +640,7 @@
bucket = self._makeOne()
for i, c in enumerate('abcdef'):
bucket[c] = i
- self.assertEqual(bucket.values(), range(6))
+ self.assertEqual(bucket.values(), list(range(6)))
def test_values_filled_w_args(self):
bucket = self._makeOne()
@@ -657,7 +657,7 @@
bucket = self._makeOne()
for i, c in enumerate('abcdef'):
bucket[c] = i
- self.assertEqual(list(bucket.itervalues()), range(6))
+ self.assertEqual(list(bucket.itervalues()), list(range(6)))
def test_itervalues_filled_w_args(self):
bucket = self._makeOne()
@@ -2273,7 +2273,7 @@
def test_values_filled_no_args(self):
ITEMS = [(y, x) for x, y in enumerate('abcdefghijklmnopqrstuvwxyz')]
tree = self._makeOne(ITEMS)
- self.assertEqual(list(tree.values()), range(26))
+ self.assertEqual(list(tree.values()), list(range(26)))
def test_values_filled_w_args(self):
ITEMS = [(y, x) for x, y in enumerate('abcdefghijklmnopqrstuvwxyz')]
@@ -2289,7 +2289,7 @@
def test_itervalues_filled_no_args(self):
ITEMS = [(y, x) for x, y in enumerate('abcdefghijklmnopqrstuvwxyz')]
tree = self._makeOne(ITEMS)
- self.assertEqual(list(tree.itervalues()), range(26))
+ self.assertEqual(list(tree.itervalues()), list(range(26)))
def test_itervalues_filled_w_args(self):
ITEMS = [(y, x) for x, y in enumerate('abcdefghijklmnopqrstuvwxyz')]
More information about the checkins
mailing list