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.
........
................
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 @@
'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: