summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2011-05-25 20:09:03 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2011-05-25 20:09:03 (GMT)
commitb79f28ccbd0cde0580a8d7198ac62e97e7cfb4c4 (patch)
tree6c7794a81d2e4fa12dcf612c539da1cddf556ac7
parent46f8264b8e976ca0a39485c8405acddc8aa8af7a (diff)
downloadcpython-b79f28ccbd0cde0580a8d7198ac62e97e7cfb4c4.zip
cpython-b79f28ccbd0cde0580a8d7198ac62e97e7cfb4c4.tar.gz
cpython-b79f28ccbd0cde0580a8d7198ac62e97e7cfb4c4.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.py2
-rw-r--r--Misc/NEWS3
-rw-r--r--Modules/_io/fileio.c2
3 files changed, 7 insertions, 0 deletions
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
index 1ec6f93..109c82d 100644
--- 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 7862e21..fd8f160 100644
--- 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 473919b..0fce1a3 100644
--- 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);