diff options
| author | Brian Curtin <brian.curtin@gmail.com> | 2010-04-01 04:06:54 +0000 |
|---|---|---|
| committer | Brian Curtin <brian.curtin@gmail.com> | 2010-04-01 04:06:54 +0000 |
| commit | 1f03f6e6911dc003f75b049ea0bf6dd390a2cc7f (patch) | |
| tree | da80c34c87b3d417cc6977c4b8e4c469b62723ff /Lib/pydoc.py | |
| parent | a94cbd8fad7bac6e80a473b3c4a91a6c94698f83 (diff) | |
| download | cpython-git-1f03f6e6911dc003f75b049ea0bf6dd390a2cc7f.tar.gz | |
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.
........
................
Diffstat (limited to 'Lib/pydoc.py')
| -rwxr-xr-x | Lib/pydoc.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/pydoc.py b/Lib/pydoc.py index 90dff04df2..3f2a5d85c9 100755 --- 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: |