[Python-checkins] r79518 - in python/trunk/Lib: pydoc.py test/test_pydoc.py
brian.curtin
python-checkins at python.org
Wed Mar 31 05:10:21 CEST 2010
Author: brian.curtin
Date: Wed Mar 31 05:10:21 2010
New Revision: 79518
Log:
Fix #8225. xml.etree was displaying an incorrect link when viewed in help.
Modified:
python/trunk/Lib/pydoc.py
python/trunk/Lib/test/test_pydoc.py
Modified: python/trunk/Lib/pydoc.py
==============================================================================
--- python/trunk/Lib/pydoc.py (original)
+++ python/trunk/Lib/pydoc.py Wed Mar 31 05:10:21 2010
@@ -356,7 +356,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:
Modified: python/trunk/Lib/test/test_pydoc.py
==============================================================================
--- python/trunk/Lib/test/test_pydoc.py (original)
+++ python/trunk/Lib/test/test_pydoc.py Wed Mar 31 05:10:21 2010
@@ -7,6 +7,7 @@
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 @@
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)
More information about the Python-checkins
mailing list