[Python-checkins] cpython (merge 3.2 -> default): merge 3.2

[benjamin.peterson]

http://hg.python.org/cpython/rev/204e40fa250d
changeset:   74762:204e40fa250d
parent:      74760:cca40a0ecffa
parent:      74761:048e38c87883
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Feb 04 09:56:43 2012 -0500
summary:
  merge 3.2

files:
  Doc/library/multiprocessing.rst |  8 --------
  1 files changed, 0 insertions(+), 8 deletions(-)


diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -900,14 +900,6 @@
 
 .. 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.
 

-- 
Repository URL: http://hg.python.org/cpython