[Python-checkins] r79544 - in python/branches/release26-maint: Lib/pydoc.py

[brian.curtin]

Author: brian.curtin
Date: Thu Apr  1 06:03:45 2010
New Revision: 79544

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/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/pydoc.py

Modified: python/branches/release26-maint/Lib/pydoc.py
==============================================================================
--- python/branches/release26-maint/Lib/pydoc.py	(original)
+++ python/branches/release26-maint/Lib/pydoc.py	Thu Apr  1 06:03:45 2010
@@ -357,7 +357,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: