diff options
| author | Brian Curtin <brian.curtin@gmail.com> | 2010-03-31 03:14:27 (GMT) |
|---|---|---|
| committer | Brian Curtin <brian.curtin@gmail.com> | 2010-03-31 03:14:27 (GMT) |
| commit | a5d9679ef3ef6cd5d09a17904ce5bf60d3fe247f (patch) | |
| tree | 9ee5308cdb9d48a019e4c64be47eb2323e04053c /Lib/pydoc.py | |
| parent | 65014f151a6018ba469ef8c8a9161294228b9304 (diff) | |
| download | cpython-a5d9679ef3ef6cd5d09a17904ce5bf60d3fe247f.zip cpython-a5d9679ef3ef6cd5d09a17904ce5bf60d3fe247f.tar.gz cpython-a5d9679ef3ef6cd5d09a17904ce5bf60d3fe247f.tar.bz2 | |
Merged revisions 79518 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79518 | brian.curtin | 2010-03-30 22:10:21 -0500 (Tue, 30 Mar 2010) | 2 lines
Fix #8225. xml.etree was displaying an incorrect link when viewed in help.
........
Diffstat (limited to 'Lib/pydoc.py')
| -rwxr-xr-x | Lib/pydoc.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/pydoc.py b/Lib/pydoc.py index e983212..03c0d09 100755 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -356,7 +356,8 @@ class Doc: 'marshal', 'posix', 'signal', 'sys', 'thread', 'zipimport') or (file.startswith(basedir) and - not file.startswith(os.path.join(basedir, 'site-packages'))))): + not file.startswith(os.path.join(basedir, 'site-packages')))) and + object.__name__ not in ('xml.etree')): if docloc.startswith("http://"): docloc = "%s/%s" % (docloc.rstrip("/"), object.__name__) else: |