commit 328ec7455f11f14cb4bf7077c6a4fa48b2356433
author Antoine Pitrou <solipsis@pitrou.net> Tue Sep 14 18:37:24 2010 +0000
committer Antoine Pitrou <solipsis@pitrou.net> Tue Sep 14 18:37:24 2010 +0000
tree 283338f8069ce73208fc79f2d66bf7a337a60e17
parent 9e0b864ac07ab85b618ccf3831eae97b2c91fb2e

Issue #9854: The default read() implementation in io.RawIOBase now
handles non-blocking readinto() returning None correctly.

Modules/_io/iobase.c

diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c
index c74672d..9b58137 100644
--- a/Modules/_io/iobase.c
+++ b/Modules/_io/iobase.c
@@ -777,9 +777,9 @@
         return NULL;
 
     res = PyObject_CallMethodObjArgs(self, _PyIO_str_readinto, b, NULL);
-    if (res == NULL) {
+    if (res == NULL || res == Py_None) {
         Py_DECREF(b);
-        return NULL;
+        return res;
     }
 
     n = PyNumber_AsSsize_t(res, PyExc_ValueError);