From: Skip Montanaro <skip@pobox.com>
Date: Sat, 8 Dec 2007 15:23:31 +0000 (+0000)
Subject: + "context manager"
X-Git-Tag: v2.6a1~900
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ffe455c3a2432fa34c08ad434ec51aecd366530d;p=thirdparty%2FPython%2Fcpython.git

+ "context manager"
---

diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index c8347431e1d2..1ab8a8c0b468 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -68,6 +68,11 @@ Glossary
       advanced mathematical feature.  If you're not aware of a need for them,
       it's almost certain you can safely ignore them.
     
+   context manager
+      Objects which control the environment seen in a :keyword:`with`
+      statement by defining :meth:`__enter__` and :meth:`__exit__` methods.
+      See :pep:`343`.
+
    decorator
       A function returning another function, usually applied as a function
       transformation using the ``@wrapper`` syntax.  Common examples for