diff options
| author | Brian Curtin <brian.curtin@gmail.com> | 2010-03-31 03:22:46 (GMT) |
|---|---|---|
| committer | Brian Curtin <brian.curtin@gmail.com> | 2010-03-31 03:22:46 (GMT) |
| commit | 0d8a1dd64707ad7459871f7d6035a6dd9b3cd123 (patch) | |
| tree | efc8a6036f48e6196d8a52f673778666af78a1ba /Lib/pydoc.py | |
| parent | b820f085edab3f2d2e7854ac5e8b23e4dddca15f (diff) | |
| download | cpython-0d8a1dd64707ad7459871f7d6035a6dd9b3cd123.zip cpython-0d8a1dd64707ad7459871f7d6035a6dd9b3cd123.tar.gz cpython-0d8a1dd64707ad7459871f7d6035a6dd9b3cd123.tar.bz2 | |
Merged revisions 79520 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r79520 | brian.curtin | 2010-03-30 22:19:28 -0500 (Tue, 30 Mar 2010) | 9 lines
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 79fb54a..196056c 100755 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -349,7 +349,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: |