mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merged revisions 86596 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86596 | ezio.melotti | 2010-11-20 21:04:17 +0200 (Sat, 20 Nov 2010) | 1 line

  #9424: Replace deprecated assert* methods in the Python test suite.
........
This commit is contained in:
Ezio Melotti 2010-11-21 01:30:29 +00:00
parent b65b4937e2
commit 19f2aeba67
164 changed files with 2281 additions and 2279 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Lib/test/test_collections.py
View file

@ -535,10 +535,10 @@ class TestCollectionABCs(ABCTestCase):
# Test issue 9214
mymap = UserDict()
mymap['red'] = 5
self.assert_(isinstance(mymap.keys(), Set))
self.assert_(isinstance(mymap.keys(), KeysView))
self.assert_(isinstance(mymap.items(), Set))
self.assert_(isinstance(mymap.items(), ItemsView))
self.assertTrue(isinstance(mymap.keys(), Set))
self.assertTrue(isinstance(mymap.keys(), KeysView))
self.assertTrue(isinstance(mymap.items(), Set))
self.assertTrue(isinstance(mymap.items(), ItemsView))
mymap = UserDict()
mymap['red'] = 5
@ -669,9 +669,9 @@ class TestCounter(unittest.TestCase):
]):
msg = (i, dup, words)
self.assertTrue(dup is not words)
self.assertEquals(dup, words)
self.assertEquals(len(dup), len(words))
self.assertEquals(type(dup), type(words))
self.assertEqual(dup, words)
self.assertEqual(len(dup), len(words))
self.assertEqual(type(dup), type(words))
def test_conversions(self):
# Convert to: set, list, dict
@ -879,10 +879,10 @@ class TestOrderedDict(unittest.TestCase):
OrderedDict(od),
]):
self.assertTrue(dup is not od)
self.assertEquals(dup, od)
self.assertEquals(list(dup.items()), list(od.items()))
self.assertEquals(len(dup), len(od))
self.assertEquals(type(dup), type(od))
self.assertEqual(dup, od)
self.assertEqual(list(dup.items()), list(od.items()))
self.assertEqual(len(dup), len(od))
self.assertEqual(type(dup), type(od))
def test_yaml_linkage(self):
# Verify that __reduce__ is setup in a way that supports PyYAML's dump() feature.