#11926: merge with 3.1.

Lib/pydoc.py

@@ -1576,6 +1576,9 @@ class Helper:
     #          in Doc/ and copying the output file into the Lib/ directory.
 
     keywords = {
+        'False': '',
+        'None': '',
+        'True': '',
         'and': 'BOOLEAN',
         'as': 'with',
         'assert': ('assert', ''),
@@ -1791,6 +1794,9 @@ has the same effect as typing a particular string at the help> prompt.
             elif request[:8] == 'modules ':
                 self.listmodules(request.split()[1])
             elif request in self.symbols: self.showsymbol(request)
+            elif request in ['True', 'False', 'None']:
+                # special case these keywords since they are objects too
+                doc(eval(request), 'Help on %s:')
             elif request in self.keywords: self.showtopic(request)
             elif request in self.topics: self.showtopic(request)
             elif request: doc(request, 'Help on %s:', output=self._output)

Lib/test/test_pydoc.py

@@ -3,6 +3,7 @@ import sys
 import difflib
 import inspect
 import pydoc
+import keyword
 import re
 import string
 import subprocess
@@ -465,11 +466,17 @@ class PydocUrlHandlerTest(unittest.TestCase):
         self.assertEqual(result, title)
 
 
+class TestHelper(unittest.TestCase):
+    def test_keywords(self):
+        self.assertEqual(sorted(pydoc.Helper.keywords),
+                         sorted(keyword.kwlist))
+
 def test_main():
     test.support.run_unittest(PydocDocTest,
                               TestDescriptions,
                               PydocServerTest,
                               PydocUrlHandlerTest,
+                              TestHelper,
                               )
 
 if __name__ == "__main__":