Merged revisions 79531 via svnmerge from

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

........
  r79531 | brian.curtin | 2010-03-31 11:46:38 -0600 (Wed, 31 Mar 2010) | 4 lines

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

diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index 196056c22ed4aa377f16cadd0b15686c84420905..90dff04df27cfd6ca9ed9f96c1f3596065af3558 100755 (executable)
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -350,7 +350,7 @@ class Doc:
                                  '_thread', 'zipimport') or
              (file.startswith(basedir) and
               not file.startswith(os.path.join(basedir, 'site-packages')))) and
-            object.__name__ not in ('xml.etree')):
+            object.__name__ != 'xml.etree'):
             if docloc.startswith("http://"):
                 docloc = "%s/%s" % (docloc.rstrip("/"), object.__name__)
             else: