commit | daf17e9bc8aa4aae570d9746a724ba5f3fdc7cb9 | [log] [tgz] |
---|---|---|
author | Victor Stinner <victor.stinner@haypocalc.com> | Wed May 25 22:52:37 2011 +0200 |
committer | Victor Stinner <victor.stinner@haypocalc.com> | Wed May 25 22:52:37 2011 +0200 |
tree | 95d10cf2f029b0e2bdccd9bbd8fcf6193c739e6b | |
parent | 5100a405dc6abe7f28597248b3dea415c2089d4a [diff] |
Issue #12175: RawIOBase.readall() now returns None if read() returns None.
diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c index e129ca9..176761d 100644 --- a/Modules/_io/iobase.c +++ b/Modules/_io/iobase.c
@@ -814,6 +814,14 @@ 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);