diff options
| author | Sandro Tosi <sandro.tosi@gmail.com> | 2012-01-07 16:57:24 (GMT) |
|---|---|---|
| committer | Sandro Tosi <sandro.tosi@gmail.com> | 2012-01-07 16:57:24 (GMT) |
| commit | 5e60857e91056e5bb4a22783c31eaa3153cac051 (patch) | |
| tree | ecb4a91bbfd828b8068c831fac600caa56b76bf4 | |
| parent | 0a08d7a09537b2ccfc93c5a81bd36cf5f1b1e92d (diff) | |
| parent | b52e7a9a364096d355d32927c537389cfc10a5db (diff) | |
| download | cpython-5e60857e91056e5bb4a22783c31eaa3153cac051.zip cpython-5e60857e91056e5bb4a22783c31eaa3153cac051.tar.gz cpython-5e60857e91056e5bb4a22783c31eaa3153cac051.tar.bz2 | |
merge with 3.2
| -rw-r--r-- | Doc/library/multiprocessing.rst | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst index d1070c3..7c94309 100644 --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -746,7 +746,8 @@ Connection objects are usually created using :func:`Pipe` -- see also .. 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 @@ Connection objects are usually created using :func:`Pipe` -- see also .. 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 @@ Connection objects are usually created using :func:`Pipe` -- see also .. 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. |