aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-04-19 14:05:51 +0000
committerAntoine Pitrou <solipsis@pitrou.net>2010-04-19 14:05:51 +0000
commitadbc009779995cb20f17aa24e25fcaf070974b6e (patch)
tree379dc7dc496dac3ce2c4f47424dbfb5eaf46ca5e /Doc/library/_thread.rst
parentI'll maintain syslog. I've made most of the "recent" changes to it anyway. (diff)
downloadcpython-adbc009779995cb20f17aa24e25fcaf070974b6e.tar.gz
cpython-adbc009779995cb20f17aa24e25fcaf070974b6e.tar.bz2
cpython-adbc009779995cb20f17aa24e25fcaf070974b6e.zip
Add version{added,changed} for lock timeout support.
Diffstat (limited to 'Doc/library/_thread.rst')
-rw-r--r--Doc/library/_thread.rst5
1 files changed, 5 insertions, 0 deletions
diff --git a/Doc/library/_thread.rst b/Doc/library/_thread.rst
index d4ff6dead11..80fad683b4e 100644
--- a/Doc/library/_thread.rst
+++ b/Doc/library/_thread.rst
@@ -109,6 +109,8 @@ It defines the following constants and functions:
:meth:`Lock.acquire`. Specifiying a timeout greater than this value will
raise an :exc:`OverflowError`.
+ .. versionadded:: 3.2
+
Lock objects have the following methods:
@@ -132,6 +134,9 @@ Lock objects have the following methods:
The return value is ``True`` if the lock is acquired successfully,
``False`` if not.
+ .. versionchanged:: 3.2
+ The *timeout* parameter is new.
+
.. method:: lock.release()
Releases the lock. The lock must have been acquired earlier, but not