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 dd4fdfdba814ff8ebdbf487952f07181ef3b3356..6475decc2976a4b53d3742b051b4db224c365705 100755 (executable)
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -1740,6 +1740,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 95a11af977515365264735f53b7b807c61c217a9..03b353910ce7bad36d873955e2fd6b12ac37a556 100644 (file)
--- a/Lib/test/test_pydoc.py
+++ b/Lib/test/test_pydoc.py
@@ -254,6 +254,12 @@ 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 = str(run_pydoc(missing_module), 'ascii')
+        expected = missing_pattern % missing_module.strip()
+        self.assertEqual(expected, result)
+
 
 class TestDescriptions(unittest.TestCase):
 

diff --git a/Misc/NEWS b/Misc/NEWS
index 626b512ea91a0a5dcab3429715352430234a0e4a..d1117097d64b3bfa55952f284e7d6f7c10565210 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -34,6 +34,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #6121: pydoc now ignores leading and trailing spaces in the
+  argument to the 'help' function.
+
 - Issue #6118: urllib.parse.quote_plus ignored the encoding and errors
   arguments for strings with a space in them.