summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-04-17 23:51:58 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-04-17 23:51:58 (GMT)
commit0454af9b54c4beee27d4b119771bce3d7162c793 (patch)
tree18ad6d31cec4731853b5e54608fa039a1a8cc52e /Misc
parent2d9cb9c1cb3a7dd2e60a323271fbfe80854a6817 (diff)
downloadcpython-0454af9b54c4beee27d4b119771bce3d7162c793.zip
cpython-0454af9b54c4beee27d4b119771bce3d7162c793.tar.gz
cpython-0454af9b54c4beee27d4b119771bce3d7162c793.tar.bz2
Issue #850728: Add a *timeout* parameter to the `acquire()` method of
`threading.Semaphore` objects. Original patch by Torsten Landschoff.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 4471ab1..276a7af 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -431,6 +431,7 @@ Ivan Krstić
Andrew Kuchling
Vladimir Kushnir
Cameron Laird
+Torsten Landschoff
Tino Lange
Andrew Langmead
Detlef Lannert
diff --git a/Misc/NEWS b/Misc/NEWS
index 203fd07..c758984 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -315,6 +315,9 @@ C-API
Library
-------
+- Issue #850728: Add a *timeout* parameter to the `acquire()` method of
+ `threading.Semaphore` objects. Patch by Torsten Landschoff.
+
- Issue #8322: Add a *ciphers* argument to SSL sockets, so as to change the
available cipher list. Helps fix test_ssl with OpenSSL 1.0.0.