summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-04-19 14:05:51 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-04-19 14:05:51 (GMT)
commitadbc009779995cb20f17aa24e25fcaf070974b6e (patch)
tree379dc7dc496dac3ce2c4f47424dbfb5eaf46ca5e /Doc
parent05a2f881261f3bf3bdcb990fdd90a09b23a2021a (diff)
downloadcpython-adbc009779995cb20f17aa24e25fcaf070974b6e.zip
cpython-adbc009779995cb20f17aa24e25fcaf070974b6e.tar.gz
cpython-adbc009779995cb20f17aa24e25fcaf070974b6e.tar.bz2
Add version{added,changed} for lock timeout support.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/_thread.rst5
-rw-r--r--Doc/library/threading.rst6
2 files changed, 11 insertions, 0 deletions
diff --git a/Doc/library/_thread.rst b/Doc/library/_thread.rst
index d4ff6de..80fad68 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
diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst
index 0ce6c63..31f1b0e 100644
--- a/Doc/library/threading.rst
+++ b/Doc/library/threading.rst
@@ -164,6 +164,7 @@ This module also defines the following constant:
Specifiying a timeout greater than this value will raise an
:exc:`OverflowError`.
+ .. versionadded:: 3.2
Detailed interfaces for the objects are documented below.
@@ -382,6 +383,8 @@ All methods are executed atomically.
The return value is ``True`` if the lock is acquired successfully,
``False`` if not (for example if the *timeout* expired).
+ .. versionchanged:: 3.2
+ The *timeout* parameter is new.
.. method:: Lock.release()
@@ -439,6 +442,9 @@ pair) resets the lock to unlocked and allows another thread blocked in
and as long as the lock cannot be acquired. Return true if the lock has
been acquired, false if the timeout has elapsed.
+ .. versionchanged:: 3.2
+ The *timeout* parameter is new.
+
.. method:: RLock.release()