merge in patch from tim golden to fix contextmanager support for mp.Lock()
diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py
index 105a743..a446ac3 100644
--- a/Lib/test/test_multiprocessing.py
+++ b/Lib/test/test_multiprocessing.py
@@ -546,6 +546,10 @@
self.assertEqual(lock.release(), None)
self.assertRaises((AssertionError, RuntimeError), lock.release)
+ def test_lock_context(self):
+ with self.Lock():
+ pass
+
class _TestSemaphore(BaseTestCase):
diff --git a/Misc/ACKS b/Misc/ACKS
index 426cd9a..6345442 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -256,6 +256,7 @@
Jonathan Giddy
Johannes Gijsbers
Michael Gilfix
+Tim Golden
Chris Gonnerman
David Goodger
Hans de Graaff
@@ -789,4 +790,3 @@
Uwe Zessin
Tarek ZiadĀ
Peter Åstrand
-Jesse Noller
diff --git a/Misc/NEWS b/Misc/NEWS
index b0ae319..97753ad 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -199,6 +199,9 @@
Library
-------
+- Issue #5261: Patch multiprocessing's semaphore.c to support context
+ manager use: "with multiprocessing.Lock()" works now.
+
- Issue #5177: Multiprocessing's SocketListener class now uses
socket.SO_REUSEADDR on all connections so that the user no longer needs
to wait 120 seconds for the socket to expire.
diff --git a/Modules/_multiprocessing/semaphore.c b/Modules/_multiprocessing/semaphore.c
index a5ba71e..2c2fb10 100644
--- a/Modules/_multiprocessing/semaphore.c
+++ b/Modules/_multiprocessing/semaphore.c
@@ -546,7 +546,7 @@
"acquire the semaphore/lock"},
{"release", (PyCFunction)semlock_release, METH_NOARGS,
"release the semaphore/lock"},
- {"__enter__", (PyCFunction)semlock_acquire, METH_VARARGS,
+ {"__enter__", (PyCFunction)semlock_acquire, METH_VARARGS | METH_KEYWORDS,
"enter the semaphore/lock"},
{"__exit__", (PyCFunction)semlock_release, METH_VARARGS,
"exit the semaphore/lock"},