From aeb2e8295d74013662edf8ebba2a9aac24ee7d3c Mon Sep 17 00:00:00 2001 From: Brian Curtin Date: Wed, 31 Mar 2010 03:10:21 +0000 Subject: 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 7a55023..2c954de 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: diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py index 43ad2c1..0685488 100644 --- a/Lib/test/test_pydoc.py +++ b/Lib/test/test_pydoc.py @@ -7,6 +7,7 @@ import re import pydoc import inspect import unittest +import xml.etree import test.test_support from contextlib import contextmanager from test.test_support import ( @@ -244,6 +245,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 = run_pydoc(missing_module) -- cgit v0.12