summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-04-28 04:55:29 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2011-04-28 04:55:29 (GMT)
commit60811c215fa3b16a4096461d1ef0f855497bb875 (patch)
tree5b9b3c1b5749aca9d5f57465376280b7adc80932 /Lib/test
parent121bf6aa61242b12f0897d7d3e049ed6b778f4ff (diff)
parent44aad855ddb0fed3a76c839598a9c3be31d0b7cb (diff)
downloadcpython-60811c215fa3b16a4096461d1ef0f855497bb875.zip
cpython-60811c215fa3b16a4096461d1ef0f855497bb875.tar.gz
cpython-60811c215fa3b16a4096461d1ef0f855497bb875.tar.bz2
#11926: merge with 3.2.
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_pydoc.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py
index 4a83dff..6dca0c9 100644
--- a/Lib/test/test_pydoc.py
+++ b/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
@@ -471,11 +472,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__":