From: Georg Brandl Date: Tue, 13 Mar 2007 10:07:01 +0000 (+0000) Subject: Patch #1542681: add entries for "with", "as" and "CONTEXTMANAGERS" to X-Git-Tag: v2.5.1c1~51 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6cdcdbcdaad14351d392888403419f5a3204b1a3;p=python Patch #1542681: add entries for "with", "as" and "CONTEXTMANAGERS" to pydoc's help keywords. (backport from rev. 54329) --- diff --git a/Lib/pydoc.py b/Lib/pydoc.py index ce9751787b..0a24dc1b10 100755 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -1504,6 +1504,7 @@ def writedocs(dir, pkgpath='', done=None): class Helper: keywords = { 'and': 'BOOLEAN', + 'as': 'with', 'assert': ('ref/assert', ''), 'break': ('ref/break', 'while for'), 'class': ('ref/class', 'CLASSES SPECIALMETHODS'), @@ -1531,6 +1532,7 @@ class Helper: 'return': ('ref/return', 'FUNCTIONS'), 'try': ('ref/try', 'EXCEPTIONS'), 'while': ('ref/while', 'break continue if TRUTHVALUE'), + 'with': ('ref/with', 'CONTEXTMANAGERS EXCEPTIONS yield'), 'yield': ('ref/yield', ''), } @@ -1612,6 +1614,7 @@ class Helper: 'LOOPING': ('ref/compound', 'for while break continue'), 'TRUTHVALUE': ('lib/truth', 'if while and or not BASICMETHODS'), 'DEBUGGING': ('lib/module-pdb', 'pdb'), + 'CONTEXTMANAGERS': ('ref/context-managers', 'with'), } def __init__(self, input, output): diff --git a/Misc/NEWS b/Misc/NEWS index 966b9a7133..b993ad89ea 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -202,6 +202,9 @@ Extension Modules Library ------- +- Patch #1542681: add entries for "with", "as" and "CONTEXTMANAGERS" to + pydoc's help keywords. + - Patch #1192590: Fix pdb's "ignore" and "condition" commands so they trap the IndexError caused by passing in an invalid breakpoint number.