summaryrefslogtreecommitdiff
path: root/Lib/pydoc.py
diff options
context:
space:
mode:
authorBrian Curtin <brian.curtin@gmail.com>2010-04-01 04:03:45 +0000
committerBrian Curtin <brian.curtin@gmail.com>2010-04-01 04:03:45 +0000
commit74ee91dc0708fe0c813a6540335a049121a4d99a (patch)
tree6f1f2d6c467f0ff66930b7d80b47f4c40d8852cf /Lib/pydoc.py
parentda343d47f9009b4d255ae5619a480e20ef924ec8 (diff)
downloadcpython-git-74ee91dc0708fe0c813a6540335a049121a4d99a.tar.gz
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. ........
Diffstat (limited to 'Lib/pydoc.py')
-rwxr-xr-xLib/pydoc.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index 2314f275f2..4d6584b4fc 100755
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -357,7 +357,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: