[Python-checkins] cpython (merge 3.2 -> default): (Merge 3.2) Issue #12175: FileIO.readall() now raises a ValueError instead of

Wed May 25 22:13:54 CEST 2011

http://hg.python.org/cpython/rev/9051275a68fe
changeset: 70383:9051275a68fe
parent: 70380:6a2ca77b2c07
parent: 70382:745e373c0b8e
user: Victor Stinner <victor.stinner at haypocalc.com>
date: Wed May 25 22:13:47 2011 +0200
summary:
 (Merge 3.2) Issue #12175: FileIO.readall() now raises a ValueError instead of
an IOError if the file is closed.
files:
 Lib/test/test_io.py | 2 ++
 Misc/NEWS | 3 +++
 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
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -2512,6 +2512,8 @@
 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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1062,6 +1062,9 @@
 Library
 -------
 
+- Issue #12175: FileIO.readall() now raises a ValueError instead of an IOError
+ if the file is closed.
+
 - Issue #10916: mmap should not segfault when a file is mapped using 0 as length
 and a non-zero offset, and an attempt to read past the end of file is made
 (IndexError is raised instead). Patch by Ross Lagerwall.
diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c
--- a/Modules/_io/fileio.c
+++ b/Modules/_io/fileio.c
@@ -583,6 +583,8 @@
 Py_ssize_t total = 0;
 int n;
 
+ if (self->fd < 0)
+ return err_closed();
 if (!_PyVerify_fd(self->fd))
 return PyErr_SetFromErrno(PyExc_IOError);
 
-- 
Repository URL: http://hg.python.org/cpython
