summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-09-14 18:53:07 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-09-14 18:53:07 (GMT)
commite5e75c64f24dc8c7e5ee17bfa46d7f3222ebc0fc (patch)
tree46b65cc31d41f1049dda849d4d8fb41d9f46d73b /Doc
parent0e428f2c3a30d627c34dfbbfab0b1eadb828fdfa (diff)
downloadcpython-e5e75c64f24dc8c7e5ee17bfa46d7f3222ebc0fc.zip
cpython-e5e75c64f24dc8c7e5ee17bfa46d7f3222ebc0fc.tar.gz
cpython-e5e75c64f24dc8c7e5ee17bfa46d7f3222ebc0fc.tar.bz2
Merged revisions 84814 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84814 | antoine.pitrou | 2010-09-14 20:37:24 +0200 (mar., 14 sept. 2010) | 4 lines Issue #9854: The default read() implementation in io.RawIOBase now handles non-blocking readinto() returning None correctly. ........
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/io.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/Doc/library/io.rst b/Doc/library/io.rst
index b2e586a..faf1aea 100644
--- a/Doc/library/io.rst
+++ b/Doc/library/io.rst
@@ -361,8 +361,9 @@ I/O Base Classes
.. method:: readinto(b)
- Read up to len(b) bytes into bytearray *b* and return the number of bytes
- read.
+ Read up to len(b) bytes into bytearray *b* and return the number ofbytes
+ read. If the object is in non-blocking mode and no bytes are available,
+ ``None`` is returned.
.. method:: write(b)