From dc020b17ab33992a9369fcb479fd2ee929164f9f Mon Sep 17 00:00:00 2001 From: "R. David Murray" Date: Wed, 27 May 2009 22:11:32 +0000 Subject: [PATCH] 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. ........ ................ --- Lib/pydoc.py | 1 + Lib/test/test_pydoc.py | 6 ++++++ Misc/NEWS | 3 +++ 3 files changed, 10 insertions(+) diff --git a/Lib/pydoc.py b/Lib/pydoc.py index 2aea8c0fa2c3..c632212d5b9f 100755 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -1739,6 +1739,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 95a11af97751..03b353910ce7 100644 --- 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 7c6512e141d9..a3ac2b09150b 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -65,6 +65,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. -- 2.47.3