Merged revisions 79545 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r79545 | brian.curtin | 2010-03-31 23:05:25 -0500 (Wed, 31 Mar 2010) | 9 lines

  Merged revisions 79543 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r79543 | brian.curtin | 2010-03-31 23:02:00 -0500 (Wed, 31 Mar 2010) | 2 lines

    Fix a test_pydoc failure on Neal Norwitz's buildbot.
  ........
................

diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index 90dff04df27cfd6ca9ed9f96c1f3596065af3558..3f2a5d85c9eae8e4de665b7d535b98b0e775aaac 100755 (executable)
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -350,7 +350,7 @@ class Doc:
                                  '_thread', 'zipimport') or
              (file.startswith(basedir) and
               not file.startswith(os.path.join(basedir, 'site-packages')))) and
-            object.__name__ != 'xml.etree'):
+            object.__name__ not in ('xml.etree', 'test.pydoc_mod')):
             if docloc.startswith("http://"):
                 docloc = "%s/%s" % (docloc.rstrip("/"), object.__name__)
             else: