diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-09-14 18:48:19 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-09-14 18:48:19 (GMT) |
| commit | 6391b3440ff72071f06d8b53a30aa8771a6ff44d (patch) | |
| tree | 6ce23bcb7edf1382bec444a8645c918bfb856ba7 /Doc | |
| parent | 93db23ef2f128abae78101c556675d1f84c8f6e6 (diff) | |
| download | cpython-6391b3440ff72071f06d8b53a30aa8771a6ff44d.zip cpython-6391b3440ff72071f06d8b53a30aa8771a6ff44d.tar.gz cpython-6391b3440ff72071f06d8b53a30aa8771a6ff44d.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.rst | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Doc/library/io.rst b/Doc/library/io.rst index f3cd261..7ae656e 100644 --- a/Doc/library/io.rst +++ b/Doc/library/io.rst @@ -371,8 +371,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) |