From b0881f2de09baf3a09b6238aaa7e845c1f374960 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Fri, 21 May 2010 21:48:10 +0000 Subject: [PATCH] Merged revisions 81440 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r81440 | georg.brandl | 2010-05-21 23:47:05 +0200 (Fr, 21 Mai 2010) | 1 line Correct info for Semaphore.acquire() semantics under OSX. ........ --- Doc/library/multiprocessing.rst | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst index 901c460ed46..9bdaf6fed21 100644 --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -836,7 +836,7 @@ object -- see :ref:`multiprocessing-managers`. A bounded semaphore object: a clone of :class:`threading.BoundedSemaphore`. - (On Mac OS X this is indistinguishable from :class:`Semaphore` because + (On Mac OS X, this is indistinguishable from :class:`Semaphore` because ``sem_getvalue()`` is not implemented on that platform). .. class:: Condition([lock]) @@ -872,9 +872,8 @@ object -- see :ref:`multiprocessing-managers`. specifies a timeout in seconds. If *block* is ``False`` then *timeout* is ignored. -.. note:: - On OS/X ``sem_timedwait`` is unsupported, so timeout arguments for the - aforementioned :meth:`acquire` methods will be ignored on OS/X. + On Mac OS X, ``sem_timedwait`` is unsupported, so calling ``acquire()`` with + a timeout will emulate that function's behavior using a sleeping loop. .. note::