Issue #12175: FileIO.readall() now raises a ValueError instead of an IOError if

the file is closed.

diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
index 1ec6f93a0e01b833a9cbab7e0d8d30b0c1fbae4f..109c82d283d0375b0afda2c17368dcd5f4593de3 100644 (file)
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -2467,6 +2467,8 @@ class MiscIOTest(unittest.TestCase):
             self.assertRaises(ValueError, f.read)
             if hasattr(f, "read1"):
                 self.assertRaises(ValueError, f.read1, 1024)
+            if hasattr(f, "readall"):
+                self.assertRaises(ValueError, f.readall)
             if hasattr(f, "readinto"):
                 self.assertRaises(ValueError, f.readinto, bytearray(1024))
             self.assertRaises(ValueError, f.readline)

diff --git a/Misc/NEWS b/Misc/NEWS
index 7862e21ecaea23590767af78ee3522c20927a286..fd8f1606898e0728adfef609397874895b50b528 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -75,6 +75,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #12175: FileIO.readall() now raises a ValueError instead of an IOError
+  if the file is closed.
+
 - Issue #12100: Don't reset incremental encoders of CJK codecs at each call to
   their encode() method anymore, but continue to call the reset() method if the
   final argument is True.

diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c
index 473919b7a7137f04bf141a345c2532bbba83ddf1..0fce1a33869de69ea32b8f98efe348fd6f1b5662 100644 (file)
--- a/Modules/_io/fileio.c
+++ b/Modules/_io/fileio.c
@@ -536,6 +536,8 @@ fileio_readall(fileio *self)
     Py_ssize_t total = 0;
     int n;
 
+    if (self->fd < 0)
+        return err_closed();
     if (!_PyVerify_fd(self->fd))
         return PyErr_SetFromErrno(PyExc_IOError);