diff options
| author | Brian Curtin <brian.curtin@gmail.com> | 2010-04-01 04:05:25 (GMT) |
|---|---|---|
| committer | Brian Curtin <brian.curtin@gmail.com> | 2010-04-01 04:05:25 (GMT) |
| commit | edef05b0a3a50d177bbae95d211fea9d869b0ee9 (patch) | |
| tree | 165b85e71048b362adde46679d072ba7228e3711 /Lib | |
| parent | 3af01a15790d5750004acb07ce7ab335aa489699 (diff) | |
| download | cpython-edef05b0a3a50d177bbae95d211fea9d869b0ee9.zip cpython-edef05b0a3a50d177bbae95d211fea9d869b0ee9.tar.gz cpython-edef05b0a3a50d177bbae95d211fea9d869b0ee9.tar.bz2 | |
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')
| -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 50b0690..6b9dd3d 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: |