From: Alexander Belopolsky <alexander.belopolsky@gmail.com>
Date: Tue, 11 Jan 2011 15:23:22 +0000 (+0000)
Subject: Merged revisions 82547 via svnmerge from
X-Git-Tag: v3.2.1b1~347^2~77
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7be05b221d5c20ab4a78993d54a37247c6b33d7b;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 82547 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82547 | alexander.belopolsky | 2010-07-04 13:00:20 -0400 (Sun, 04 Jul 2010) | 3 lines

  Issue #9118: help(None) will now return NoneType doc instead of
  starting interactive help.
........
---

diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index 1afc5f70ed84..916076a6c2de 100755
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -1706,8 +1706,9 @@ class Helper:
             return ''
         return '<pydoc.Helper instance>'
 
-    def __call__(self, request=None):
-        if request is not None:
+    _GoInteractive = object()
+    def __call__(self, request=_GoInteractive):
+        if request is not self._GoInteractive:
             self.help(request)
         else:
             self.intro()