changeset:   70384:f2414bb35c96
branch:      2.7
parent:      70363:8ba0192a0eb1
user:        Victor Stinner <victor.stinner@haypocalc.com>
date:        Wed May 25 22:15:36 2011 +0200
files:       Lib/test/test_io.py Misc/NEWS Modules/_io/fileio.c
description:
Issue #12175: FileIO.readall() now raises a ValueError instead of an IOError if
the file is closed.


diff -r 8ba0192a0eb1 -r f2414bb35c96 Lib/test/test_io.py
--- a/Lib/test/test_io.py	Wed May 25 01:19:57 2011 +0200
+++ b/Lib/test/test_io.py	Wed May 25 22:15:36 2011 +0200
@@ -2468,6 +2468,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 -r 8ba0192a0eb1 -r f2414bb35c96 Misc/NEWS
--- a/Misc/NEWS	Wed May 25 01:19:57 2011 +0200
+++ b/Misc/NEWS	Wed May 25 22:15:36 2011 +0200
@@ -83,6 +83,9 @@
 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 -r 8ba0192a0eb1 -r f2414bb35c96 Modules/_io/fileio.c
--- a/Modules/_io/fileio.c	Wed May 25 01:19:57 2011 +0200
+++ b/Modules/_io/fileio.c	Wed May 25 22:15:36 2011 +0200
@@ -539,6 +539,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);