diff options
| -rwxr-xr-x | Lib/pydoc.py | 10 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
2 files changed, 8 insertions, 4 deletions
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 <name> ... Show text documentation on something. <name> 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 <name> 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 <name> 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 <keyword> Search for a keyword in the synopsis lines of all available modules. @@ -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 |