diff options
| author | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2011-01-11 15:23:22 (GMT) |
|---|---|---|
| committer | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2011-01-11 15:23:22 (GMT) |
| commit | 7be05b221d5c20ab4a78993d54a37247c6b33d7b (patch) | |
| tree | 78e5bf200c96b588919a0b007855c6a119c86aee /Lib | |
| parent | cff7e2f4a98315f9c2ec5bea9cf9ef05a2096fe9 (diff) | |
| download | cpython-7be05b221d5c20ab4a78993d54a37247c6b33d7b.zip cpython-7be05b221d5c20ab4a78993d54a37247c6b33d7b.tar.gz cpython-7be05b221d5c20ab4a78993d54a37247c6b33d7b.tar.bz2 | |
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.
........
Diffstat (limited to 'Lib')
| -rwxr-xr-x | Lib/pydoc.py | 5 |
1 files 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 '<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() |