mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

merge 70783 to py3k

Browse source
This commit is contained in:
Jesse Noller 2009-03-31 03:25:07 +00:00
parent 6d4a9cf85f
commit f8d0085510
4 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/test/test_multiprocessing.py
View file

@ -548,6 +548,10 @@ class _TestLock(BaseTestCase):
self.assertEqual(lock.release(), None) self.assertEqual(lock.release(), None)
self.assertRaises((AssertionError, RuntimeError), lock.release) self.assertRaises((AssertionError, RuntimeError), lock.release)
def test_lock_context(self):
with self.Lock():
pass
class _TestSemaphore(BaseTestCase): class _TestSemaphore(BaseTestCase):

2
Misc/ACKS
View file

@ -257,6 +257,7 @@ Dinu Gherman
Jonathan Giddy Jonathan Giddy
Johannes Gijsbers Johannes Gijsbers
Michael Gilfix Michael Gilfix
Tim Golden
Chris Gonnerman Chris Gonnerman
David Goodger David Goodger
Hans de Graaff Hans de Graaff
@ -794,4 +795,3 @@ Siebren van der Zee
Uwe Zessin Uwe Zessin
Tarek ZiadŽ Tarek ZiadŽ
Peter Åstrand Peter Åstrand
Jesse Noller

3
Misc/NEWS
View file

@ -49,6 +49,9 @@ Core and Builtins
Library Library
------- -------
- Issue #5261: Patch multiprocessing's semaphore.c to support context
manager use: "with multiprocessing.Lock()" works now.
- Issue #5236: Change time.strptime() to only take strings. Didn't work with - Issue #5236: Change time.strptime() to only take strings. Didn't work with
bytes already but the failure was non-obvious. bytes already but the failure was non-obvious.

2
Modules/_multiprocessing/semaphore.c
View file

@ -546,7 +546,7 @@ static PyMethodDef semlock_methods[] = {
"acquire the semaphore/lock"}, "acquire the semaphore/lock"},
{"release", (PyCFunction)semlock_release, METH_NOARGS, {"release", (PyCFunction)semlock_release, METH_NOARGS,
"release the semaphore/lock"}, "release the semaphore/lock"},
{"__enter__", (PyCFunction)semlock_acquire, METH_VARARGS, {"__enter__", (PyCFunction)semlock_acquire, METH_VARARGS | METH_KEYWORDS,
"enter the semaphore/lock"}, "enter the semaphore/lock"},
{"__exit__", (PyCFunction)semlock_release, METH_VARARGS, {"__exit__", (PyCFunction)semlock_release, METH_VARARGS,
"exit the semaphore/lock"}, "exit the semaphore/lock"},