changeset:   70381:742ff94cdd20
branch:      3.1
parent:      70360:a024183e046f
user:        Victor Stinner <victor.stinner@haypocalc.com>
date:        Wed May 25 22:09:03 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 a024183e046f -r 742ff94cdd20 Lib/test/test_io.py
--- a/Lib/test/test_io.py	Wed May 25 01:13:59 2011 +0200
+++ b/Lib/test/test_io.py	Wed May 25 22:09:03 2011 +0200
@@ -2467,6 +2467,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 a024183e046f -r 742ff94cdd20 Misc/NEWS
--- a/Misc/NEWS	Wed May 25 01:13:59 2011 +0200
+++ b/Misc/NEWS	Wed May 25 22:09:03 2011 +0200
@@ -75,6 +75,9 @@
 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 -r a024183e046f -r 742ff94cdd20 Modules/_io/fileio.c
--- a/Modules/_io/fileio.c	Wed May 25 01:13:59 2011 +0200
+++ b/Modules/_io/fileio.c	Wed May 25 22:09:03 2011 +0200
@@ -536,6 +536,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);