changeset:   70386:fb29dc650d24
branch:      3.2
parent:      70382:745e373c0b8e
parent:      70385:4a7118cff1d3
user:        Victor Stinner <victor.stinner@haypocalc.com>
date:        Wed May 25 22:49:15 2011 +0200
files:       Lib/_pyio.py Lib/test/test_io.py Misc/NEWS Modules/_io/iobase.c
description:
(Merge 3.1) Issue #12175: RawIOBase.readall() now returns None if read()
returns None.


diff -r 745e373c0b8e -r fb29dc650d24 Lib/_pyio.py
--- a/Lib/_pyio.py	Wed May 25 22:11:55 2011 +0200
+++ b/Lib/_pyio.py	Wed May 25 22:49:15 2011 +0200
@@ -558,7 +558,11 @@
             if not data:
                 break
             res += data
-        return bytes(res)
+        if res:
+            return bytes(res)
+        else:
+            # b'' or None
+            return data
 
     def readinto(self, b):
         """Read up to len(b) bytes into bytearray b.
diff -r 745e373c0b8e -r fb29dc650d24 Lib/test/test_io.py
--- a/Lib/test/test_io.py	Wed May 25 22:11:55 2011 +0200
+++ b/Lib/test/test_io.py	Wed May 25 22:49:15 2011 +0200
@@ -827,14 +827,17 @@
         # Inject some None's in there to simulate EWOULDBLOCK
         rawio = self.MockRawIO((b"abc", b"d", None, b"efg", None, None, None))
         bufio = self.tp(rawio)
-
         self.assertEqual(b"abcd", bufio.read(6))
         self.assertEqual(b"e", bufio.read(1))
         self.assertEqual(b"fg", bufio.read())
         self.assertEqual(b"", bufio.peek(1))
-        self.assertTrue(None is bufio.read())
+        self.assertIsNone(bufio.read())
         self.assertEqual(b"", bufio.read())
 
+        rawio = self.MockRawIO((b"a", None, None))
+        self.assertEqual(b"a", rawio.readall())
+        self.assertIsNone(rawio.readall())
+
     def test_read_past_eof(self):
         rawio = self.MockRawIO((b"abc", b"d", b"efg"))
         bufio = self.tp(rawio)
diff -r 745e373c0b8e -r fb29dc650d24 Misc/NEWS
--- a/Misc/NEWS	Wed May 25 22:11:55 2011 +0200
+++ b/Misc/NEWS	Wed May 25 22:49:15 2011 +0200
@@ -13,6 +13,11 @@
 Library
 -------
 
+- Issue #12175: RawIOBase.readall() now returns None if read() returns None.
+
+- Issue #12175: FileIO.readall() now raises a ValueError instead of an IOError
+  if the file is closed.
+
 - Issue #12070: Fix the Makefile parser of the sysconfig module to handle
   correctly references to "bogus variable" (e.g. "prefix=$/opt/python").
 
@@ -731,9 +736,6 @@
 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 745e373c0b8e -r fb29dc650d24 Modules/_io/iobase.c
--- a/Modules/_io/iobase.c	Wed May 25 22:11:55 2011 +0200
+++ b/Modules/_io/iobase.c	Wed May 25 22:49:15 2011 +0200
@@ -815,6 +815,14 @@
             Py_DECREF(chunks);
             return NULL;
         }
+        if (data == Py_None) {
+            if (PyList_GET_SIZE(chunks) == 0) {
+                Py_DECREF(chunks);
+                return data;
+            }
+            Py_DECREF(data);
+            break;
+        }
         if (!PyBytes_Check(data)) {
             Py_DECREF(chunks);
             Py_DECREF(data);