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

[sandro.tosi]

http://hg.python.org/cpython/rev/9f0728521731
changeset:   74291:9f0728521731
parent:      74288:1ea8b7233fd7
parent:      74289:1d8286235da5
user:        Sandro Tosi <sandro.tosi at gmail.com>
date:        Sat Jan 07 17:57:24 2012 +0100
summary:
  merge with 3.2

files:
  Doc/library/multiprocessing.rst |  9 ++++++---
  1 files changed, 6 insertions(+), 3 deletions(-)


diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -746,7 +746,8 @@
    .. method:: recv()
 
       Return an object sent from the other end of the connection using
-      :meth:`send`.  Raises :exc:`EOFError` if there is nothing left to receive
+      :meth:`send`.  Blocks until there its something to receive.  Raises
+      :exc:`EOFError` if there is nothing left to receive
       and the other end was closed.
 
    .. method:: fileno()
@@ -780,7 +781,8 @@
    .. method:: recv_bytes([maxlength])
 
       Return a complete message of byte data sent from the other end of the
-      connection as a string.  Raises :exc:`EOFError` if there is nothing left
+      connection as a string.  Blocks until there is something to receive.
+      Raises :exc:`EOFError` if there is nothing left
       to receive and the other end has closed.
 
       If *maxlength* is specified and the message is longer than *maxlength*
@@ -795,7 +797,8 @@
    .. method:: recv_bytes_into(buffer[, offset])
 
       Read into *buffer* a complete message of byte data sent from the other end
-      of the connection and return the number of bytes in the message.  Raises
+      of the connection and return the number of bytes in the message.  Blocks
+      until there is something to receive.  Raises
       :exc:`EOFError` if there is nothing left to receive and the other end was
       closed.
 

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