From: Brian Curtin <brian.curtin@gmail.com>
Date: Wed, 31 Mar 2010 17:46:38 +0000 (+0000)
Subject: Merged revisions 79529 via svnmerge from
X-Git-Tag: v3.2a1~1290
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fd2bfb02db1a5b4d06b054ce578b565cca1fd085;p=python

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 62ca3b0d35..50b06904a8 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: