From: Cody Maloney <cmaloney@users.noreply.github.com>
Date: Fri, 31 Jan 2025 08:40:44 +0000 (-0800)
Subject: Revert "gh-129005: _pyio.BufferedIO remove copy on readall (#129454)" (#129500)
X-Git-Tag: v3.14.0a5~162
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3ebe3d7688475e98a34d691e1ba50d8b7178a575;p=thirdparty%2FPython%2Fcpython.git

Revert "gh-129005: _pyio.BufferedIO remove copy on readall (#129454)" (#129500)

This reverts commit e1c4ba928852eac0b0e0bded1c314e3e36975286.
---

diff --git a/Lib/_pyio.py b/Lib/_pyio.py
index 755e02587708..76a27910da4d 100644
--- a/Lib/_pyio.py
+++ b/Lib/_pyio.py
@@ -1062,9 +1062,6 @@ class BufferedReader(_BufferedIOMixin):
                 if chunk is None:
                     return buf[pos:] or None
                 else:
-                    # Avoid slice + copy if there is no data in buf
-                    if not buf:
-                        return chunk
                     return buf[pos:] + chunk
             chunks = [buf[pos:]]  # Strip the consumed bytes.
             current_size = 0
diff --git a/Misc/NEWS.d/next/Library/2025-01-29-00-00-01.gh-issue-129005.aV_3O8.rst b/Misc/NEWS.d/next/Library/2025-01-29-00-00-01.gh-issue-129005.aV_3O8.rst
deleted file mode 100644
index 48ee57109be2..000000000000
--- a/Misc/NEWS.d/next/Library/2025-01-29-00-00-01.gh-issue-129005.aV_3O8.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-:mod:`!_pyio`: Remove an unnecessary copy when ``_pyio.BufferedReader.read()``
-is called to read all data from a file and has no data already in buffer.