[Python-3000-checkins] r53853 - in python/branches/p3yk: BROKEN Lib/test/test_iter.py

brett.cannon python-3000-checkins at python.org
Thu Feb 22 05:49:10 CET 2007


Author: brett.cannon
Date: Thu Feb 22 05:49:03 2007
New Revision: 53853

Modified:
   python/branches/p3yk/BROKEN
   python/branches/p3yk/Lib/test/test_iter.py
Log:
Fix test_iter after the dict views conversion.


Modified: python/branches/p3yk/BROKEN
==============================================================================
--- python/branches/p3yk/BROKEN	(original)
+++ python/branches/p3yk/BROKEN	Thu Feb 22 05:49:03 2007
@@ -1,2 +1,2 @@
     test_bsddb test_bsddb3 test_compile test_dumbdbm
-    test_importhooks test_iter
+    test_importhooks

Modified: python/branches/p3yk/Lib/test/test_iter.py
==============================================================================
--- python/branches/p3yk/Lib/test/test_iter.py	(original)
+++ python/branches/p3yk/Lib/test/test_iter.py	Thu Feb 22 05:49:03 2007
@@ -225,7 +225,7 @@
         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 @@
         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 @@
         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 @@
         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 @@
                          [(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:


More information about the Python-3000-checkins mailing list