From 0caf6d85f98f3cffde22a91ccb9e043758402bf7 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Thu, 22 Feb 2007 04:49:03 +0000 Subject: [PATCH] Fix test_iter after the dict views conversion. --- BROKEN | 2 +- Lib/test/test_iter.py | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/BROKEN b/BROKEN index c9d7a04a41c..80523e7d9ae 100644 --- a/BROKEN +++ b/BROKEN @@ -1,2 +1,2 @@ test_bsddb test_bsddb3 test_compile test_dumbdbm - test_importhooks test_iter + test_importhooks diff --git a/Lib/test/test_iter.py b/Lib/test/test_iter.py index 24a4f777998..820911da35a 100644 --- a/Lib/test/test_iter.py +++ b/Lib/test/test_iter.py @@ -225,7 +225,7 @@ class TestCase(unittest.TestCase): dict = {} for i in range(10): dict[i] = None - self.check_for_loop(dict, dict.keys()) + self.check_for_loop(dict, list(dict.keys())) # Test a file def test_iter_file(self): @@ -254,7 +254,7 @@ class TestCase(unittest.TestCase): self.assertEqual(list(range(10, -1, -1)), range(10, -1, -1)) d = {"one": 1, "two": 2, "three": 3} - self.assertEqual(list(d), d.keys()) + self.assertEqual(list(d), list(d.keys())) self.assertRaises(TypeError, list, list) self.assertRaises(TypeError, list, 42) @@ -319,7 +319,7 @@ class TestCase(unittest.TestCase): self.assertEqual(filter(None, "abc"), "abc") d = {"one": 1, "two": 2, "three": 3} - self.assertEqual(filter(None, d), d.keys()) + self.assertEqual(filter(None, d), list(d.keys())) self.assertRaises(TypeError, filter, None, list) self.assertRaises(TypeError, filter, None, 42) @@ -393,9 +393,9 @@ class TestCase(unittest.TestCase): self.assertEqual(map(lambda x: x+1, SequenceClass(5)), range(1, 6)) d = {"one": 1, "two": 2, "three": 3} - self.assertEqual(map(None, d), d.keys()) - self.assertEqual(map(lambda k, d=d: (k, d[k]), d), d.items()) - dkeys = d.keys() + self.assertEqual(map(None, d), list(d.keys())) + self.assertEqual(map(lambda k, d=d: (k, d[k]), d), list(d.items())) + dkeys = list(d.keys()) expected = [(i < len(d) and dkeys[i] or None, i, i < len(d) and dkeys[i] or None) @@ -437,7 +437,7 @@ class TestCase(unittest.TestCase): [(0,), (1,), (2,)]) d = {"one": 1, "two": 2, "three": 3} - self.assertEqual(d.items(), list(zip(d, d.values()))) + self.assertEqual(list(d.items()), list(zip(d, d.values()))) # Generate all ints starting at constructor arg. class IntsFrom: