Merged revisions 86596 via svnmerge from

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 13:34:58 +00:00
parent 40a92f5c65
commit 2623a37852
184 changed files with 2328 additions and 2326 deletions

View file

@ -330,7 +330,7 @@ class CommonTest(seq_tests.CommonTest):
self.assertRaises(BadExc, d.remove, 'c')
for x, y in zip(d, e):
# verify that original order and values are retained.
self.assert_(x is y)
self.assertIs(x, y)
def test_count(self):
a = self.type2test([0, 1, 2])*3
@ -466,7 +466,7 @@ class CommonTest(seq_tests.CommonTest):
u = self.type2test([0, 1])
u2 = u
u += [2, 3]
self.assert_(u is u2)
self.assertIs(u, u2)
u = self.type2test("spam")
u += "eggs"