Author: ezio.melotti Date: Mon Nov 29 03:02:10 2010 New Revision: 86856 Log: Use assertCountEqual instead of assertItemsEqual Modified: python/branches/py3k/Lib/test/test_cfgparser.py python/branches/py3k/Lib/test/test_cgi.py Modified: python/branches/py3k/Lib/test/test_cfgparser.py ============================================================================== --- python/branches/py3k/Lib/test/test_cfgparser.py (original) +++ python/branches/py3k/Lib/test/test_cfgparser.py Mon Nov 29 03:02:10 2010 @@ -357,7 +357,7 @@ L = [section for section in cf] L.sort() eq = self.assertEqual - elem_eq = self.assertItemsEqual + elem_eq = self.assertCountEqual eq(L, sorted(["A", "B", self.default_section, "a"])) eq(cf["a"].keys(), {"b"}) eq(cf["a"]["b"], "value", Modified: python/branches/py3k/Lib/test/test_cgi.py ============================================================================== --- python/branches/py3k/Lib/test/test_cgi.py (original) +++ python/branches/py3k/Lib/test/test_cgi.py Mon Nov 29 03:02:10 2010 @@ -131,7 +131,7 @@ if isinstance(expect, dict): # test dict interface self.assertEqual(len(expect), len(fs)) - self.assertItemsEqual(expect.keys(), fs.keys()) + self.assertCountEqual(expect.keys(), fs.keys()) ##self.assertEqual(norm(expect.values()), norm(fs.values())) ##self.assertEqual(norm(expect.items()), norm(fs.items())) self.assertEqual(fs.getvalue("nonexistent field", "default"), "default")