From: Brian Curtin <brian.curtin@gmail.com>
Date: Wed, 31 Mar 2010 17:43:52 +0000 (+0000)
Subject: Merged revisions 79529 via svnmerge from
X-Git-Tag: v2.6.6rc1~520
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=da343d47f9009b4d255ae5619a480e20ef924ec8;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 03c0d09a2e..2314f275f2 100755
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -357,7 +357,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: