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

[victor.stinner]

http://hg.python.org/cpython/rev/745e373c0b8e
changeset:   70382:745e373c0b8e
branch:      3.2
parent:      70361:4289cc96835e
parent:      70381:742ff94cdd20
user:        Victor Stinner <victor.stinner at haypocalc.com>
date:        Wed May 25 22:11:55 2011 +0200
summary:
  (Merge 3.1) 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
@@ -2505,6 +2505,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
@@ -731,6 +731,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