[Python-checkins] r79545 - in python/branches/py3k: Lib/pydoc.py

brian.curtin python-checkins at python.org
Thu Apr 1 06:05:25 CEST 2010


Author: brian.curtin
Date: Thu Apr  1 06:05:25 2010
New Revision: 79545

Log:
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.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/pydoc.py

Modified: python/branches/py3k/Lib/pydoc.py
==============================================================================
--- python/branches/py3k/Lib/pydoc.py	(original)
+++ python/branches/py3k/Lib/pydoc.py	Thu Apr  1 06:05:25 2010
@@ -350,7 +350,7 @@
                                  '_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:


More information about the Python-checkins mailing list