Correct recently merged tests:

- two bugs in pydoc.py
- remove test about classic classes

diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index fbad574c2da57ec64986c029965304456ae591ca..31122e165784fb6826801443a5d919496bd63b13 100755 (executable)
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# -*- coding: Latin-1 -*-
+# -*- coding: latin-1 -*-
 """Generate Python documentation in HTML or text for interactive use.
 
 In the Python interpreter, do "from pydoc import help" to provide online
@@ -1074,7 +1074,7 @@ class TextDoc(Doc):
         if submodules:
             submodules.sort()
             result = result + self.section(
-                'SUBMODULES', join(submodules, '\n'))
+                'SUBMODULES', '\n'.join(submodules))
 
         if classes:
             classlist = [value for key, value in classes]
@@ -1484,7 +1484,8 @@ def render_doc(thing, title='Python Library Documentation: %s', forceload=0):
         desc += ' in ' + name[:name.rfind('.')]
     elif module and module is not object:
         desc += ' in module ' + module.__name__
-    elif not (inspect.ismodule(object) or
+
+    if not (inspect.ismodule(object) or
               inspect.isclass(object) or
               inspect.isroutine(object) or
               inspect.isgetsetdescriptor(object) or

diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py
index d9670fbbe8ec8da5cc2a33e32c1b88b1d6c3d27c..ba37ec12fe63739e48005b70047b9eaaefcd68ed 100644 (file)
--- a/Lib/test/test_pydoc.py
+++ b/Lib/test/test_pydoc.py
@@ -9,14 +9,6 @@ class TestDescriptions(unittest.TestCase):
         doc = pydoc.render_doc(pydocfodder)\r
         assert "pydocfodder" in doc\r
 \r
-    def test_classic_class(self):\r
-        class C: "Classic class"\r
-        c = C()\r
-        self.failUnlessEqual(pydoc.describe(C), 'class C')\r
-        self.failUnlessEqual(pydoc.describe(c), 'instance of C')\r
-        self.failUnless('instance of C in module test.test_pydoc'\r
-                        in pydoc.render_doc(c))\r
-\r
     def test_class(self):\r
         class C(object): "New-style class"\r
         c = C()\r