diff options
author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-05-25 20:15:36 (GMT) |
---|---|---|
committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-05-25 20:15:36 (GMT) |
commit | 5100a405dc6abe7f28597248b3dea415c2089d4a (patch) | |
tree | bf09fa381f9e17025383925a95e0fddfaaba7a56 | |
parent | e2d9e26a105c24367e9fa3dcfaeaa97d8261c5ef (diff) | |
download | cpython-5100a405dc6abe7f28597248b3dea415c2089d4a.zip cpython-5100a405dc6abe7f28597248b3dea415c2089d4a.tar.gz cpython-5100a405dc6abe7f28597248b3dea415c2089d4a.tar.bz2 |
Issue #12175: FileIO.readall() now raises a ValueError instead of an IOError if
the file is closed.
-rw-r--r-- | Lib/test/test_io.py | 2 | ||||
-rw-r--r-- | Misc/NEWS | 3 | ||||
-rw-r--r-- | Modules/_io/fileio.c | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py index 8af8a64..9b18b70 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) @@ -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 83921ea..25a0c27 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); |