changeset:   91527:1492a42b8308
branch:      2.7
parent:      91523:0ba6ebd90b9d
user:        Victor Stinner <victor.stinner@gmail.com>
date:        Wed Jul 02 23:12:48 2014 +0200
files:       Misc/NEWS Modules/_io/fileio.c
description:
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.


diff -r 0ba6ebd90b9d -r 1492a42b8308 Misc/NEWS
--- a/Misc/NEWS	Wed Jul 02 10:48:27 2014 +0300
+++ b/Misc/NEWS	Wed Jul 02 23:12:48 2014 +0200
@@ -13,6 +13,9 @@
 Library
 -------
 
+- 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.
+
 - Issue #19870: BaseCookie now parses 'secure' and 'httponly' flags.
   Backport of issue #16611.
 
diff -r 0ba6ebd90b9d -r 1492a42b8308 Modules/_io/fileio.c
--- a/Modules/_io/fileio.c	Wed Jul 02 10:48:27 2014 +0300
+++ b/Modules/_io/fileio.c	Wed Jul 02 23:12:48 2014 +0200
@@ -577,9 +577,9 @@
                 }
                 continue;
             }
-            if (total > 0)
-                break;
             if (errno == EAGAIN) {
+                if (total > 0)
+                    break;
                 Py_DECREF(result);
                 Py_RETURN_NONE;
             }