Merged revisions 73715 via svnmerge from

svn+ssh://svn.python.org/python/branches/py3k

........
  r73715 | benjamin.peterson | 2009-07-01 01:06:06 +0200 (Mi, 01 Jul 2009) | 1 line

  convert old fail* assertions to assert*
........
This commit is contained in:
Georg Brandl 2009-08-13 08:51:18 +00:00
parent ef82be368a
commit ab91fdef1f
274 changed files with 4538 additions and 4538 deletions

View file

@ -125,12 +125,12 @@ class PlatformTest(unittest.TestCase):
def test_uname(self):
res = platform.uname()
self.assert_(any(res))
self.assertTrue(any(res))
def test_java_ver(self):
res = platform.java_ver()
if sys.platform == 'java':
self.assert_(all(res))
self.assertTrue(all(res))
def test_win32_ver(self):
res = platform.win32_ver()
@ -148,7 +148,7 @@ class PlatformTest(unittest.TestCase):
real_ver = ln.strip().split()[-1]
break
fd.close()
self.failIf(real_ver is None)
self.assertFalse(real_ver is None)
self.assertEquals(res[0], real_ver)
# res[1] claims to contain