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

@ -154,9 +154,9 @@ class CmdLineTest(unittest.TestCase):
print(printed_file)
print(printed_package)
print(printed_argv0)
self.assert_(printed_file in data)
self.assert_(printed_package in data)
self.assert_(printed_argv0 in data)
self.assertTrue(printed_file in data)
self.assertTrue(printed_package in data)
self.assertTrue(printed_argv0 in data)
def _check_import_error(self, script_name, expected_msg,
*cmd_line_switches):
@ -166,7 +166,7 @@ class CmdLineTest(unittest.TestCase):
print('Output from test script %r:' % script_name)
print(data)
print('Expected output: %r' % expected_msg)
self.assert_(expected_msg in data)
self.assertTrue(expected_msg in data)
def test_basic_script(self):
with temp_dir() as script_dir: