[Python-checkins] r87934 - in python/branches/release31-maint: Lib/pydoc.py

[alexander.belopolsky]

Author: alexander.belopolsky
Date: Tue Jan 11 16:23:22 2011
New Revision: 87934

Log:
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.
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/pydoc.py

Modified: python/branches/release31-maint/Lib/pydoc.py
==============================================================================
--- python/branches/release31-maint/Lib/pydoc.py	(original)
+++ python/branches/release31-maint/Lib/pydoc.py	Tue Jan 11 16:23:22 2011
@@ -1706,8 +1706,9 @@
             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()