From: Martin v. Löwis Date: Sat, 14 Jun 2003 09:03:46 +0000 (+0000) Subject: Support keyword and topics help in cli(). Fixes #715782. X-Git-Tag: v2.3c1~445 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b8c084e82c7bae771c0197b177f5c32c7e513c74;p=python Support keyword and topics help in cli(). Fixes #715782. --- diff --git a/Lib/pydoc.py b/Lib/pydoc.py index fe114fd782..abafc0e6b4 100755 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -2116,7 +2116,7 @@ def cli(): else: writedoc(arg) else: - doc(arg) + help.help(arg) except ErrorDuringImport, value: print value @@ -2126,9 +2126,11 @@ def cli(): %s ... Show text documentation on something. may be the name of a - function, module, or package, or a dotted reference to a class or - function within a module or module in a package. If contains - a '%s', it is used as the path to a Python source file to document. + Python keyword, topic, function, module, or package, or a dotted + reference to a class or function within a module or module in a + package. If contains a '%s', it is used as the path to a + Python source file to document. If name is 'keywords', 'topics', + or 'modules', a listing of these things is displayed. %s -k Search for a keyword in the synopsis lines of all available modules. diff --git a/Misc/NEWS b/Misc/NEWS index 07a5b57c2d..1346c58834 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -111,6 +111,8 @@ Library Tools/Demos ----------- +- pydoc now offers help on keywords and topics. + - Tools/idle is gone; long live Lib/idlelib. - diff.py is a new script for print file diffs in context, unified, or ndiff