Merged revisions 72966 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72966 | r.david.murray | 2009-05-27 16:07:21 -0400 (Wed, 27 May 2009) | 4 lines

  fix issue #6121 by stripping spaces from the argument in the 'help'
  function.
........

diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index 3afb9814d250a3b76c177b7f4ea256da268c94be..1103b013cc65a81027ce6026bf8cbae3208b30c2 100755 (executable)
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -1751,6 +1751,7 @@ has the same effect as typing a particular string at the help> prompt.
 
     def help(self, request):
         if type(request) is type(''):
+            request = request.strip()
             if request == 'help': self.intro()
             elif request == 'keywords': self.listkeywords()
             elif request == 'symbols': self.listsymbols()

diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py
index 91a997783c5f076d65222a256362ca5b04e8b8a7..7990d3a492d9e7327e5bc5a9aaaa642766c65e21 100644 (file)
--- a/Lib/test/test_pydoc.py
+++ b/Lib/test/test_pydoc.py
@@ -237,6 +237,14 @@ class PyDocDocTest(unittest.TestCase):
         self.assertEqual(expected, result,
             "documentation for missing module found")
 
+    def test_input_strip(self):
+        missing_module = " test.i_am_not_here "
+        result = run_pydoc(missing_module)
+        expected = missing_pattern % missing_module.strip()
+        self.assertEqual(expected, result,
+            "white space was not stripped from module name "
+            "or other error output mismatch")
+
 
 class TestDescriptions(unittest.TestCase):
 

diff --git a/Misc/NEWS b/Misc/NEWS
index 148d1304aefd65aaf89ae29ac0baa53d1367aba6..5b0f81841e74ec825b26930b508a265eb0c51244 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -50,6 +50,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #6121: pydoc now ignores leading and trailing spaces in the
+  argument to the 'help' function.
+
 - Issue #6050: Don't fail extracting a directory from a zipfile if
   the directory already exists.