diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-09-14 18:53:07 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-09-14 18:53:07 (GMT) |
| commit | e5e75c64f24dc8c7e5ee17bfa46d7f3222ebc0fc (patch) | |
| tree | 46b65cc31d41f1049dda849d4d8fb41d9f46d73b /Lib/_pyio.py | |
| parent | 0e428f2c3a30d627c34dfbbfab0b1eadb828fdfa (diff) | |
| download | cpython-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 'Lib/_pyio.py')
| -rw-r--r-- | Lib/_pyio.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/_pyio.py b/Lib/_pyio.py index ffbfda1..4485233 100644 --- a/Lib/_pyio.py +++ b/Lib/_pyio.py @@ -542,6 +542,8 @@ class RawIOBase(IOBase): return self.readall() b = bytearray(n.__index__()) n = self.readinto(b) + if n is None: + return None del b[n:] return bytes(b) @@ -559,7 +561,7 @@ class RawIOBase(IOBase): """Read up to len(b) bytes into b. Returns number of bytes read (0 for EOF), or None if the object - is set not to block as has no data to read. + is set not to block and has no data to read. """ self._unsupported("readinto") |