Merged revisions 62486-62487 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62486 | amaury.forgeotdarc | 2008-04-24 16:22:26 -0400 (Thu, 24 Apr 2008) | 7 lines

  Add a few tests for pydoc.

  This is a modified version of a patch proposed by Humberto Diogenes
  in the discussion of issue1883.

  I will merge manually this change into the py3k branch: the tests must be adapted.
........
  r62487 | amaury.forgeotdarc | 2008-04-24 16:41:50 -0400 (Thu, 24 Apr 2008) | 2 lines

  Use absolute import for test package
........

Lib/test/test_pydoc.py

+from test import test_support
+import unittest
+import pydoc
+
+class TestDescriptions(unittest.TestCase):
+    def test_module(self):
+        # Check that pydocfodder module can be described
+        from test import pydocfodder
+        doc = pydoc.render_doc(pydocfodder)
+        assert "pydocfodder" in doc
+
+    def test_classic_class(self):
+        class C: "Classic class"
+        c = C()
+        self.failUnlessEqual(pydoc.describe(C), 'class C')
+        self.failUnlessEqual(pydoc.describe(c), 'instance of C')
+        self.failUnless('instance of C in module test.test_pydoc'
+                        in pydoc.render_doc(c))
+
+    def test_class(self):
+        class C(object): "New-style class"
+        c = C()
+
+        self.failUnlessEqual(pydoc.describe(C), 'class C')
+        self.failUnlessEqual(pydoc.describe(c), 'C')
+        self.failUnless('C in module test.test_pydoc object'
+                        in pydoc.render_doc(c))
+
+def test_main():
+    test_support.run_unittest(TestDescriptions)
+
+if __name__ == "__main__":
+    unittest.main()

Lib/test/test_sundry.py

@@ -86,7 +86,6 @@ class TestUntestedModules(unittest.TestCase):
             import pdb
             import pstats
             import py_compile
-            import pydoc
             import rlcompleter
             import sched
             import smtplib