ilusha/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2026-09-29 09:55:31 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

(Merge 3.2) Issue #12175: RawIOBase.readall() now returns None if read()

Browse source 
returns None.
This commit is contained in:
Victor Stinner 2011-05-25 22:51:16 +02:00
commit d2780aedce
4 changed files with 28 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Modules/_io/iobase.c
View file

@ -815,6 +815,14 @@ rawiobase_readall(PyObject *self, PyObject *args)
Py_DECREF(chunks);
return NULL;
}
if (data == Py_None) {
if (PyList_GET_SIZE(chunks) == 0) {
Py_DECREF(chunks);
return data;
}
Py_DECREF(data);
break;
}
if (!PyBytes_Check(data)) {
Py_DECREF(chunks);
Py_DECREF(data);