Commit b1b1fef3 authored by Tres Seaver's avatar Tres Seaver

List-ify zip objects under Py3k.

parent 37afcfb8
...@@ -346,10 +346,10 @@ class MappingBase(Base): ...@@ -346,10 +346,10 @@ class MappingBase(Base):
i += 1 i += 1
items = list(t.items(min=12, max=20)) items = list(t.items(min=12, max=20))
self.assertEqual(items, zip(range(12, 21), range(24, 43, 2))) self.assertEqual(items, list(zip(range(12, 21), range(24, 43, 2))))
items = list(t.iteritems(min=12, max=20)) items = list(t.iteritems(min=12, max=20))
self.assertEqual(items, zip(range(12, 21), range(24, 43, 2))) self.assertEqual(items, list(zip(range(12, 21), range(24, 43, 2))))
def testItemsNegativeIndex(self): def testItemsNegativeIndex(self):
t = self._makeOne() t = self._makeOne()
...@@ -542,7 +542,7 @@ class MappingBase(Base): ...@@ -542,7 +542,7 @@ class MappingBase(Base):
t[i] = 1 t[i] = 1
tslice = t.items()[20:80] tslice = t.items()[20:80]
self.assertEqual(len(tslice), 60) self.assertEqual(len(tslice), 60)
self.assertEqual(list(tslice), zip(range(20, 80), [1]*60)) self.assertEqual(list(tslice), list(zip(range(20, 80), [1]*60)))
def testIterators(self): def testIterators(self):
t = self._makeOne() t = self._makeOne()
...@@ -583,7 +583,7 @@ class MappingBase(Base): ...@@ -583,7 +583,7 @@ class MappingBase(Base):
value = -3 * k value = -3 * k
t[k] = value t[k] = value
values.append(value) values.append(value)
items = zip(keys, values) items = list(zip(keys, values))
self.assertEqual(list(t.iterkeys()), keys) self.assertEqual(list(t.iterkeys()), keys)
self.assertEqual(list(t.itervalues()), values) self.assertEqual(list(t.itervalues()), values)
...@@ -604,7 +604,7 @@ class MappingBase(Base): ...@@ -604,7 +604,7 @@ class MappingBase(Base):
got = t.itervalues(lo) got = t.itervalues(lo)
self.assertEqual(goodvalues, list(got)) self.assertEqual(goodvalues, list(got))
gooditems = zip(goodkeys, goodvalues) gooditems = list(zip(goodkeys, goodvalues))
got = t.iteritems(lo) got = t.iteritems(lo)
self.assertEqual(gooditems, list(got)) self.assertEqual(gooditems, list(got))
...@@ -618,7 +618,7 @@ class MappingBase(Base): ...@@ -618,7 +618,7 @@ class MappingBase(Base):
got = t.itervalues(lo, max=hi) got = t.itervalues(lo, max=hi)
self.assertEqual(goodvalues, list(got)) self.assertEqual(goodvalues, list(got))
gooditems = zip(goodkeys, goodvalues) gooditems = list(zip(goodkeys, goodvalues))
got = t.iteritems(max=hi, min=lo) got = t.iteritems(max=hi, min=lo)
self.assertEqual(gooditems, list(got)) self.assertEqual(gooditems, list(got))
......
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