Merged revisions 79545 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r79545 | brian.curtin | 2010-03-31 23:05:25 -0500 (Wed, 31 Mar 2010) | 9 lines

  Merged revisions 79543 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r79543 | brian.curtin | 2010-03-31 23:02:00 -0500 (Wed, 31 Mar 2010) | 2 lines

    Fix a test_pydoc failure on Neal Norwitz's buildbot.
  ........
................
This commit is contained in:
Brian Curtin 2010-04-01 04:06:54 +00:00
parent a94cbd8fad
commit 1f03f6e691
1 changed files with 1 additions and 1 deletions

View File

@ -350,7 +350,7 @@ def getdocloc(self, object):
'_thread', 'zipimport') or
(file.startswith(basedir) and
not file.startswith(os.path.join(basedir, 'site-packages')))) and
object.__name__ != 'xml.etree'):
object.__name__ not in ('xml.etree', 'test.pydoc_mod')):
if docloc.startswith("http://"):
docloc = "%s/%s" % (docloc.rstrip("/"), object.__name__)
else: