diff options
| author | Georg Brandl <georg@python.org> | 2010-05-21 21:49:56 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-05-21 21:49:56 (GMT) |
| commit | 8a1450d0e6f333f4911568a6448ed510c3a14def (patch) | |
| tree | 05a4a116d444574bbb51d0a96ab88656967caefc /Doc | |
| parent | 92e97a7166207a8b335dfa883115c2366d6d8c2e (diff) | |
| download | cpython-8a1450d0e6f333f4911568a6448ed510c3a14def.zip cpython-8a1450d0e6f333f4911568a6448ed510c3a14def.tar.gz cpython-8a1450d0e6f333f4911568a6448ed510c3a14def.tar.bz2 | |
Recorded merge of revisions 81442 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
................
r81442 | georg.brandl | 2010-05-21 23:48:27 +0200 (Fr, 21 Mai 2010) | 9 lines
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.
........
................
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/multiprocessing.rst | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst index a2cdb02..85a8241 100644 --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -837,7 +837,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]) @@ -879,9 +879,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:: |