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

@ -83,13 +83,13 @@ class AutoFileTests(unittest.TestCase):
def testErrors(self):
f = self.f
self.assertEquals(f.name, TESTFN)
self.assert_(not f.isatty())
self.assert_(not f.closed)
self.assertTrue(not f.isatty())
self.assertTrue(not f.closed)
if hasattr(f, "readinto"):
self.assertRaises((IOError, TypeError), f.readinto, "")
f.close()
self.assert_(f.closed)
self.assertTrue(f.closed)
def testMethods(self):
methods = [('fileno', ()),
@ -111,7 +111,7 @@ class AutoFileTests(unittest.TestCase):
# __exit__ should close the file
self.f.__exit__(None, None, None)
self.assert_(self.f.closed)
self.assertTrue(self.f.closed)
for methodname, args in methods:
method = getattr(self.f, methodname)