changeset:   70382:745e373c0b8e
branch:      3.2
parent:      70361:4289cc96835e
parent:      70381:742ff94cdd20
user:        Victor Stinner <victor.stinner@haypocalc.com>
date:        Wed May 25 22:11:55 2011 +0200
files:       Lib/test/test_io.py Misc/NEWS Modules/_io/fileio.c
description:
(Merge 3.1) Issue #12175: FileIO.readall() now raises a ValueError instead of
an IOError if the file is closed.


diff -r 4289cc96835e -r 745e373c0b8e Lib/test/test_io.py
--- a/Lib/test/test_io.py	Wed May 25 01:15:59 2011 +0200
+++ b/Lib/test/test_io.py	Wed May 25 22:11:55 2011 +0200
@@ -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 -r 4289cc96835e -r 745e373c0b8e Misc/NEWS
--- a/Misc/NEWS	Wed May 25 01:15:59 2011 +0200
+++ b/Misc/NEWS	Wed May 25 22:11:55 2011 +0200
@@ -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 -r 4289cc96835e -r 745e373c0b8e Modules/_io/fileio.c
--- a/Modules/_io/fileio.c	Wed May 25 01:15:59 2011 +0200
+++ b/Modules/_io/fileio.c	Wed May 25 22:11:55 2011 +0200
@@ -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);