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

@ -91,7 +91,7 @@ class TestGzip(unittest.TestCase):
while 1:
L = f.readline(line_length)
if not L and line_length != 0: break
self.assert_(len(L) <= line_length)
self.assertTrue(len(L) <= line_length)
line_length = (line_length + 1) % 50
f.close()
@ -157,7 +157,7 @@ class TestGzip(unittest.TestCase):
def test_1647484(self):
for mode in ('wb', 'rb'):
f = gzip.GzipFile(self.filename, mode)
self.assert_(hasattr(f, "name"))
self.assertTrue(hasattr(f, "name"))
self.assertEqual(f.name, self.filename)
f.close()
@ -169,7 +169,7 @@ class TestGzip(unittest.TestCase):
fRead = gzip.GzipFile(self.filename)
dataRead = fRead.read()
self.assertEqual(dataRead, data1)
self.assert_(hasattr(fRead, 'mtime'))
self.assertTrue(hasattr(fRead, 'mtime'))
self.assertEqual(fRead.mtime, mtime)
fRead.close()