diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-02-04 14:56:43 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-02-04 14:56:43 (GMT) |
| commit | 94015f13f1db3dd36836061d24ab2a5919d54c77 (patch) | |
| tree | 43a4c355d58e3eed306394a219b3faad1a32b935 /Doc/library | |
| parent | edc67feaa40765e9827a75f6304801d2373898bc (diff) | |
| parent | f51ebf94bb527f66331f92ac00f66f529ded73f0 (diff) | |
| download | cpython-94015f13f1db3dd36836061d24ab2a5919d54c77.zip cpython-94015f13f1db3dd36836061d24ab2a5919d54c77.tar.gz cpython-94015f13f1db3dd36836061d24ab2a5919d54c77.tar.bz2 | |
merge 3.2
Diffstat (limited to 'Doc/library')
| -rw-r--r-- | Doc/library/multiprocessing.rst | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst index 7c94309..106ccd7 100644 --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -900,14 +900,6 @@ object -- see :ref:`multiprocessing-managers`. .. note:: - The :meth:`acquire` method of :class:`BoundedSemaphore`, :class:`Lock`, - :class:`RLock` and :class:`Semaphore` has a timeout parameter not supported - by the equivalents in :mod:`threading`. The signature is - ``acquire(block=True, timeout=None)`` with keyword parameters being - acceptable. If *block* is ``True`` and *timeout* is not ``None`` then it - specifies a timeout in seconds. If *block* is ``False`` then *timeout* is - ignored. - On Mac OS X, ``sem_timedwait`` is unsupported, so calling ``acquire()`` with a timeout will emulate that function's behavior using a sleeping loop. |