From: Georg Brandl <georg@python.org>
Date: Wed, 19 May 2010 14:06:47 +0000 (+0000)
Subject: Merged revisions 77741 via svnmerge from
X-Git-Tag: v2.6.6rc1~290
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df8923cb2ced8e3b9be63d00e5bbc6e742fae58e;p=python

Merged revisions 77741 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77741 | facundo.batista | 2010-01-25 07:15:01 +0100 (Mo, 25 Jan 2010) | 3 lines

  Added a note about Event.is_set() syntax being new to 2.6
........
---

diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst
index 94f75ed4a3..a0a1fdde0a 100644
--- a/Doc/library/threading.rst
+++ b/Doc/library/threading.rst
@@ -667,6 +667,9 @@ An event object manages an internal flag that can be set to true with the
 
       Return true if and only if the internal flag is true.
 
+      .. versionchanged:: 2.6
+         The ``is_set()`` syntax is new.
+
    .. method:: set()
 
       Set the internal flag to true. All threads waiting for it to become true