From 1f03f6e6911dc003f75b049ea0bf6dd390a2cc7f Mon Sep 17 00:00:00 2001 From: Brian Curtin Date: Thu, 1 Apr 2010 04:06:54 +0000 Subject: [PATCH] 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. ........ ................ --- Lib/pydoc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/pydoc.py b/Lib/pydoc.py index 90dff04df27..3f2a5d85c9e 100755 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -350,7 +350,7 @@ def getdocloc(self, object): '_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: