From 7be05b221d5c20ab4a78993d54a37247c6b33d7b Mon Sep 17 00:00:00 2001 From: Alexander Belopolsky Date: Tue, 11 Jan 2011 15:23:22 +0000 Subject: 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. ........ --- Lib/pydoc.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Lib/pydoc.py b/Lib/pydoc.py index 1afc5f7..916076a 100755 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -1706,8 +1706,9 @@ class Helper: return '' return '' - 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() -- cgit v0.12