From: Brian Curtin <brian.curtin@gmail.com>
Date: Wed, 31 Mar 2010 17:49:27 +0000 (+0000)
Subject: Merged revisions 79531 via svnmerge from
X-Git-Tag: v3.1.3rc1~1009
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a94cbd8fad7bac6e80a473b3c4a91a6c94698f83;p=python

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 196056c22e..90dff04df2 100755
--- 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: