From ab91fdef1f1e556203a2eee98ba7d379e4790de9 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Thu, 13 Aug 2009 08:51:18 +0000 Subject: 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* ........ --- Lib/test/test_pydoc.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Lib/test/test_pydoc.py') diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py index 00a2ada6c5..76822afe38 100644 --- a/Lib/test/test_pydoc.py +++ b/Lib/test/test_pydoc.py @@ -309,7 +309,7 @@ class TestDescriptions(unittest.TestCase): # Check that pydocfodder module can be described from test import pydocfodder doc = pydoc.render_doc(pydocfodder) - self.assert_("pydocfodder" in doc) + self.assertTrue("pydocfodder" in doc) def test_classic_class(self): class C: "Classic class" @@ -317,7 +317,7 @@ class TestDescriptions(unittest.TestCase): self.assertEqual(pydoc.describe(C), 'class C') self.assertEqual(pydoc.describe(c), 'C') expected = 'C in module %s' % __name__ - self.assert_(expected in pydoc.render_doc(c)) + self.assertTrue(expected in pydoc.render_doc(c)) def test_class(self): class C(object): "New-style class" @@ -326,7 +326,7 @@ class TestDescriptions(unittest.TestCase): self.assertEqual(pydoc.describe(C), 'class C') self.assertEqual(pydoc.describe(c), 'C') expected = 'C in module %s object' % __name__ - self.assert_(expected in pydoc.render_doc(c)) + self.assertTrue(expected in pydoc.render_doc(c)) def test_main(): -- cgit v1.2.1