diff options
| author | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2011-01-11 15:35:23 (GMT) |
|---|---|---|
| committer | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2011-01-11 15:35:23 (GMT) |
| commit | d501dde89d1ced7c5a96c727511b94d1b8d3a45c (patch) | |
| tree | 1f09715f14f89e62fc517e6b80ceeee12667ef91 | |
| parent | 2d47ef637ac292f004a46a4e37d3abcf4007cac6 (diff) | |
| download | cpython-d501dde89d1ced7c5a96c727511b94d1b8d3a45c.zip cpython-d501dde89d1ced7c5a96c727511b94d1b8d3a45c.tar.gz cpython-d501dde89d1ced7c5a96c727511b94d1b8d3a45c.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.
........
| -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 c672cc3..90fa1b3 100755 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -1718,8 +1718,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() |