From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Wed, 25 May 2011 20:15:36 +0000 (+0200)
Subject: Issue #12175: FileIO.readall() now raises a ValueError instead of an IOError if
X-Git-Tag: v2.7.2rc1~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5100a405dc6abe7f28597248b3dea415c2089d4a;p=python

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 8af8a64622..9b18b70488 100644
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -2468,6 +2468,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 6801fd7084..e6fdfa4e15 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -83,6 +83,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #12175: FileIO.readall() now raises a ValueError instead of an IOError
+  if the file is closed.
+
 - Issue #1441530: In imaplib, use makefile() to wrap the SSL socket to avoid
   heap fragmentation and MemoryError with some malloc implementations.
 
diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c
index 83921eaae7..25a0c27914 100644
--- a/Modules/_io/fileio.c
+++ b/Modules/_io/fileio.c
@@ -539,6 +539,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);