cpython: 440279cec378 (original) (raw)
Mercurial > cpython
changeset 91526:440279cec378
(Merge 3.4) Issue #21090: io.FileIO.readall() does not ignore I/O errors anymore. Before, it ignored I/O errors if at least the first C call read() succeed. [#21090]
Victor Stinner victor.stinner@gmail.com | |
---|---|
date | Wed, 02 Jul 2014 23:00:38 +0200 |
parents | 3744b6ad8c3f(current diff)652b62213072(diff) |
children | 3d176d6a05e6 |
files | Misc/NEWS Modules/_io/fileio.c |
diffstat | 2 files changed, 5 insertions(+), 2 deletions(-)[+] [-] Misc/NEWS 3 Modules/_io/fileio.c 4 |
line wrap: on
line diff
--- a/Misc/NEWS +++ b/Misc/NEWS @@ -103,6 +103,9 @@ Core and Builtins Library ------- +- Issue #21090: io.FileIO.readall() does not ignore I/O errors anymore. Before,
- Issue #5800: headers parameter of wsgiref.headers.Headers is now optional. Initial patch by Pablo Torres Navarrete and SilentGhost.
--- a/Modules/_io/fileio.c +++ b/Modules/_io/fileio.c @@ -694,9 +694,9 @@ fileio_readall(fileio *self) } continue; }
if (bytes_read > 0)[](#l2.7)
break;[](#l2.8) if (errno == EAGAIN) {[](#l2.9)
if (bytes_read > 0)[](#l2.10)
break;[](#l2.11) Py_DECREF(result);[](#l2.12) Py_RETURN_NONE;[](#l2.13) }[](#l2.14)