commit e5e75c64f24dc8c7e5ee17bfa46d7f3222ebc0fc
author Antoine Pitrou <solipsis@pitrou.net> Tue Sep 14 18:53:07 2010 +0000
committer Antoine Pitrou <solipsis@pitrou.net> Tue Sep 14 18:53:07 2010 +0000
tree 46b65cc31d41f1049dda849d4d8fb41d9f46d73b
parent 0e428f2c3a30d627c34dfbbfab0b1eadb828fdfa

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.
........

Modules/_io/iobase.c

diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c
index 2d664ab..dfc1a3a 100644
--- a/Modules/_io/iobase.c
+++ b/Modules/_io/iobase.c
@@ -776,9 +776,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);