Commit 5100a405 authored by Victor Stinner's avatar Victor Stinner

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

the file is closed.
parent e2d9e26a
...@@ -2468,6 +2468,8 @@ class MiscIOTest(unittest.TestCase): ...@@ -2468,6 +2468,8 @@ class MiscIOTest(unittest.TestCase):
self.assertRaises(ValueError, f.read) self.assertRaises(ValueError, f.read)
if hasattr(f, "read1"): if hasattr(f, "read1"):
self.assertRaises(ValueError, f.read1, 1024) self.assertRaises(ValueError, f.read1, 1024)
if hasattr(f, "readall"):
self.assertRaises(ValueError, f.readall)
if hasattr(f, "readinto"): if hasattr(f, "readinto"):
self.assertRaises(ValueError, f.readinto, bytearray(1024)) self.assertRaises(ValueError, f.readinto, bytearray(1024))
self.assertRaises(ValueError, f.readline) self.assertRaises(ValueError, f.readline)
......
...@@ -83,6 +83,9 @@ Core and Builtins ...@@ -83,6 +83,9 @@ Core and Builtins
Library 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 - Issue #1441530: In imaplib, use makefile() to wrap the SSL socket to avoid
heap fragmentation and MemoryError with some malloc implementations. heap fragmentation and MemoryError with some malloc implementations.
......
...@@ -539,6 +539,8 @@ fileio_readall(fileio *self) ...@@ -539,6 +539,8 @@ fileio_readall(fileio *self)
Py_ssize_t total = 0; Py_ssize_t total = 0;
int n; int n;
if (self->fd < 0)
return err_closed();
if (!_PyVerify_fd(self->fd)) if (!_PyVerify_fd(self->fd))
return PyErr_SetFromErrno(PyExc_IOError); return PyErr_SetFromErrno(PyExc_IOError);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment