Issue #12175: RawIOBase.readall() now returns None if read() returns None.

diff --git a/Lib/_pyio.py b/Lib/_pyio.py
index fa00eb4fb3e9f31cc893fa080a58295ab3d77b3e..5474a4e6a8c5aba4e7c1a7b17cd4cfa2a9b34495 100644 (file)
--- a/Lib/_pyio.py
+++ b/Lib/_pyio.py
@@ -556,7 +556,11 @@ class RawIOBase(IOBase):
             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 b.

diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
index 109c82d283d0375b0afda2c17368dcd5f4593de3..5333bb6dfd7e7b834126bc9151040fd90b2f9bcb 100644 (file)
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -790,14 +790,17 @@ class BufferedReaderTest(unittest.TestCase, CommonBufferedTests):
         # 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 --git a/Misc/NEWS b/Misc/NEWS
index fd8f1606898e0728adfef609397874895b50b528..015018cab8307d935f28ab91caec9949af3580b2 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -75,6 +75,8 @@ Core and Builtins
 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.
 

diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c
index 84b560a029756af20d9639fb0943352bd55961ad..316321aa7892c4d2a6f1516c3969a91ad2f45dcb 100644 (file)
--- a/Modules/_io/iobase.c
+++ b/Modules/_io/iobase.c
@@ -814,6 +814,14 @@ rawiobase_readall(PyObject *self, PyObject *args)
             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);