summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2009-05-27 20:07:21 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2009-05-27 20:07:21 (GMT)
commitd67ea7d4c68a417d9854a15bc4f51478770ef920 (patch)
treeb574a6069efcc70984896a0e6cedc11c306ed3f1
parent1afec5d6bf1f0e5d0cb62e633c69ed37e2f03a9c (diff)
downloadcpython-d67ea7d4c68a417d9854a15bc4f51478770ef920.zip
cpython-d67ea7d4c68a417d9854a15bc4f51478770ef920.tar.gz
cpython-d67ea7d4c68a417d9854a15bc4f51478770ef920.tar.bz2
fix issue #6121 by stripping spaces from the argument in the 'help'
function.
-rwxr-xr-xLib/pydoc.py1
-rw-r--r--Lib/test/test_pydoc.py8
-rw-r--r--Misc/NEWS3
3 files changed, 12 insertions, 0 deletions
diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index a70f016..76a2b64 100755
--- 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 91a9977..7990d3a 100644
--- 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 daab366..a2b8233 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -307,6 +307,9 @@ Core and Builtins
Library
-------
+- Issue #6121: pydoc now ignores leading and trailing spaces in the
+ argument to the 'help' function.
+
- In unittest, using a skipping decorator on a class is now equivalent to
skipping every test on the class. The ClassTestSuite class has been removed.