[Python-checkins] r72970 - in python/branches/release30-maint: Lib/pydoc.py Lib/test/test_pydoc.py Misc/NEWS

[r.david.murray]

Author: r.david.murray
Date: Thu May 28 00:11:32 2009
New Revision: 72970

Log:
Merged revisions 72968 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r72968 | r.david.murray | 2009-05-27 16:56:59 -0400 (Wed, 27 May 2009) | 10 lines
  
  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.
  ........
................


Modified:
   python/branches/release30-maint/   (props changed)
   python/branches/release30-maint/Lib/pydoc.py
   python/branches/release30-maint/Lib/test/test_pydoc.py
   python/branches/release30-maint/Misc/NEWS

Modified: python/branches/release30-maint/Lib/pydoc.py
==============================================================================
--- python/branches/release30-maint/Lib/pydoc.py	(original)
+++ python/branches/release30-maint/Lib/pydoc.py	Thu May 28 00:11:32 2009
@@ -1739,6 +1739,7 @@
 
     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()

Modified: python/branches/release30-maint/Lib/test/test_pydoc.py
==============================================================================
--- python/branches/release30-maint/Lib/test/test_pydoc.py	(original)
+++ python/branches/release30-maint/Lib/test/test_pydoc.py	Thu May 28 00:11:32 2009
@@ -254,6 +254,12 @@
         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):
 

Modified: python/branches/release30-maint/Misc/NEWS
==============================================================================
--- python/branches/release30-maint/Misc/NEWS	(original)
+++ python/branches/release30-maint/Misc/NEWS	Thu May 28 00:11:32 2009
@@ -65,6 +65,9 @@
 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.