diff options
author | Guido van Rossum <guido@python.org> | 2007-02-15 03:49:08 (GMT) |
---|---|---|
committer | Guido van Rossum <guido@python.org> | 2007-02-15 03:49:08 (GMT) |
commit | d81206d1526f869645bca83193da5ddfefaf4936 (patch) | |
tree | bc4d810d4928cb8a96bbea2898248c9d21c74a61 /Lib/test | |
parent | e34cdd1bc157f8e166d3693551445ae882f9fe7c (diff) | |
download | cpython-d81206d1526f869645bca83193da5ddfefaf4936.zip cpython-d81206d1526f869645bca83193da5ddfefaf4936.tar.gz cpython-d81206d1526f869645bca83193da5ddfefaf4936.tar.bz2 |
Fix the damage to UserDict and its tests.
Clearly this is not the right way to fix this; UserDict and MixinDict
ought to be redesigned with the new dict API in mind. But I'm not
claiming to be in charge of library redesign, I only want zero failing
tests.
Diffstat (limited to 'Lib/test')
-rw-r--r-- | Lib/test/mapping_tests.py | 6 | ||||
-rw-r--r-- | Lib/test/test_userdict.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Lib/test/mapping_tests.py b/Lib/test/mapping_tests.py index a260d4f..09e9dcb 100644 --- a/Lib/test/mapping_tests.py +++ b/Lib/test/mapping_tests.py @@ -317,7 +317,7 @@ class TestMappingProtocol(BasicTestMappingProtocol): def test_keys(self): BasicTestMappingProtocol.test_keys(self) d = self._empty_mapping() - self.assertEqual(d.keys(), []) + self.assertEqual(list(d.keys()), []) d = self._full_mapping({'a': 1, 'b': 2}) k = d.keys() self.assert_('a' in k) @@ -327,13 +327,13 @@ class TestMappingProtocol(BasicTestMappingProtocol): def test_values(self): BasicTestMappingProtocol.test_values(self) d = self._full_mapping({1:2}) - self.assertEqual(d.values(), [2]) + self.assertEqual(list(d.values()), [2]) def test_items(self): BasicTestMappingProtocol.test_items(self) d = self._full_mapping({1:2}) - self.assertEqual(d.items(), [(1, 2)]) + self.assertEqual(list(d.items()), [(1, 2)]) def test_contains(self): d = self._empty_mapping() diff --git a/Lib/test/test_userdict.py b/Lib/test/test_userdict.py index 05d6d9e..500971b 100644 --- a/Lib/test/test_userdict.py +++ b/Lib/test/test_userdict.py @@ -92,7 +92,7 @@ class UserDictTest(mapping_tests.TestHashMappingProtocol): # Test keys, items, values self.assertEqual(u2.keys(), d2.keys()) self.assertEqual(u2.items(), d2.items()) - self.assertEqual(u2.values(), d2.values()) + self.assertEqual(list(u2.values()), list(d2.values())) # Test "in". for i in u2.keys(): |