From 0d8a1dd64707ad7459871f7d6035a6dd9b3cd123 Mon Sep 17 00:00:00 2001 From: Brian Curtin Date: Wed, 31 Mar 2010 03:22:46 +0000 Subject: 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. ........ ................ --- Lib/pydoc.py | 3 ++- Lib/test/test_pydoc.py | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) 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: diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py index b467d2c..14ab6f1 100644 --- a/Lib/test/test_pydoc.py +++ b/Lib/test/test_pydoc.py @@ -8,6 +8,7 @@ import pydoc import inspect import unittest import test.support +import xml.etree from contextlib import contextmanager from test.support import TESTFN, forget, rmtree, EnvironmentVarGuard @@ -253,6 +254,11 @@ class PyDocDocTest(unittest.TestCase): print_diffs(expected_text, result) self.fail("outputs are not equal, see diff above") + def test_issue8225(self): + # Test issue8225 to ensure no doc link appears for xml.etree + result, doc_loc = get_pydoc_text(xml.etree) + self.assertEqual(doc_loc, "", "MODULE DOCS incorrectly includes a link") + def test_not_here(self): missing_module = "test.i_am_not_here" result = str(run_pydoc(missing_module), 'ascii') -- cgit v0.12