From b6a87542b301e54872807940f71c06be9f03f990 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Tue, 13 Mar 2007 10:06:48 +0000
Subject: [PATCH] Patch #1542681: add entries for "with", "as" and
 "CONTEXTMANAGERS" to pydoc's help keywords.

---
 Lib/pydoc.py | 3 +++
 Misc/NEWS    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index bf4400f6d24..8435175d5e0 100755
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -1511,6 +1511,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'),
@@ -1538,6 +1539,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', ''),
     }
 
@@ -1619,6 +1621,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 007497db52d..605d9b5d5cf 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -168,6 +168,9 @@ Core and builtins
 Library
 -------
 
+- Patch #1542681: add entries for "with", "as" and "CONTEXTMANAGERS" to
+  pydoc's help keywords.
+
 - Patch #1555098: use str.join() instead of repeated string
   concatenation in robotparser.