From: Antoine Pitrou <solipsis@pitrou.net>
Date: Tue, 4 May 2010 23:31:41 +0000 (+0000)
Subject: Add what's new entry for r80157 and r80071.
X-Git-Tag: v3.2a1~932
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e95a9ff112159f8cd46d6cdb5f8da19c92469e59;p=python

Add what's new entry for r80157 and r80071.
---

diff --git a/Doc/whatsnew/3.2.rst b/Doc/whatsnew/3.2.rst
index 94d8f7bc02..877283bf75 100644
--- a/Doc/whatsnew/3.2.rst
+++ b/Doc/whatsnew/3.2.rst
@@ -123,6 +123,11 @@ Multi-threading
 
   (Contributed by Antoine Pitrou; :issue:`3001`.)
 
+* Regular and recursive locks now accept an optional *timeout* argument
+  to their ``acquire`` method. (Contributed by Antoine Pitrou; :issue:`7316`)
+  Similarly, :meth:`threading.Semaphore.acquire` also gains a *timeout*
+  argument. (Contributed by Torsten Landschoff; :issue:`850728`.)
+
 
 Optimizations
 =============