mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-25 04:34:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merged revisions 79520 via svnmerge from

Browse source 
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.
  ........
................
This commit is contained in:
Brian Curtin 2010-03-31 03:22:46 +00:00
parent b820f085ed
commit 0d8a1dd647
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Lib/pydoc.py
View file

@ -349,7 +349,8 @@ class Doc:
'marshal', 'posix', 'signal', 'sys', 'marshal', 'posix', 'signal', 'sys',
'_thread', 'zipimport') or '_thread', 'zipimport') or
(file.startswith(basedir) and (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://"): if docloc.startswith("http://"):
docloc = "%s/%s" % (docloc.rstrip("/"), object.__name__) docloc = "%s/%s" % (docloc.rstrip("/"), object.__name__)
else: else:

6
Lib/test/test_pydoc.py
View file

@ -8,6 +8,7 @@ import pydoc
import inspect import inspect
import unittest import unittest
import test.support import test.support
import xml.etree
from contextlib import contextmanager from contextlib import contextmanager
from test.support import TESTFN, forget, rmtree, EnvironmentVarGuard from test.support import TESTFN, forget, rmtree, EnvironmentVarGuard
@ -253,6 +254,11 @@ class PyDocDocTest(unittest.TestCase):
print_diffs(expected_text, result) print_diffs(expected_text, result)
self.fail("outputs are not equal, see diff above") 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): def test_not_here(self):
missing_module = "test.i_am_not_here" missing_module = "test.i_am_not_here"
result = str(run_pydoc(missing_module), 'ascii') result = str(run_pydoc(missing_module), 'ascii')