diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-05-25 20:49:15 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-05-25 20:49:15 (GMT) |
| commit | 988512cfd7c896dd8b900d0f00cba05c4c807dc3 (patch) | |
| tree | 00d1050f4d082f25471ca7b9e61aa745e29a99c8 /Lib/_pyio.py | |
| parent | 4767114e77fc68cfcd630318ec58e632b00c2e04 (diff) | |
| parent | a80987f20d0c73532127e1c3f69f7983c5c443d2 (diff) | |
| download | cpython-988512cfd7c896dd8b900d0f00cba05c4c807dc3.zip cpython-988512cfd7c896dd8b900d0f00cba05c4c807dc3.tar.gz cpython-988512cfd7c896dd8b900d0f00cba05c4c807dc3.tar.bz2 | |
(Merge 3.1) Issue #12175: RawIOBase.readall() now returns None if read()
returns None.
Diffstat (limited to 'Lib/_pyio.py')
| -rw-r--r-- | Lib/_pyio.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Lib/_pyio.py b/Lib/_pyio.py index 35dea41..b79d5fc 100644 --- a/Lib/_pyio.py +++ b/Lib/_pyio.py @@ -558,7 +558,11 @@ class RawIOBase(IOBase): if not data: break res += data - return bytes(res) + if res: + return bytes(res) + else: + # b'' or None + return data def readinto(self, b): """Read up to len(b) bytes into bytearray b. |