From: Serhiy Storchaka <storchaka@gmail.com>
Date: Thu, 11 Jun 2026 11:06:27 +0000 (+0300)
Subject: [3.13] gh-150285: Fix merging error in GH-150458 (GH-151320)
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=f1c8176636d38ccb0aeddd209bdab6a76b3c7289;p=thirdparty%2FPython%2Fcpython.git

[3.13] gh-150285: Fix merging error in GH-150458 (GH-151320)
---

diff --git a/Lib/_pyio.py b/Lib/_pyio.py
index 4ac60b5ee15f..7c1635cb3310 100644
--- a/Lib/_pyio.py
+++ b/Lib/_pyio.py
@@ -125,15 +125,9 @@ def open(file, mode="r", buffering=-1, encoding=None, errors=None,
     argument is given, the default buffering policy works as follows:
 
     * Binary files are buffered in fixed-size chunks; the size of the buffer
-<<<<<<< HEAD
-      is chosen using a heuristic trying to determine the underlying device's
-      "block size" and falling back on `io.DEFAULT_BUFFER_SIZE`.
+      is chosen using a heuristic trying to determine the underlying
+      device's "block size" and falling back on `io.DEFAULT_BUFFER_SIZE`.
       On many systems, the buffer will typically be 4096 or 8192 bytes long.
-=======
-      is max(min(blocksize, 8 MiB), DEFAULT_BUFFER_SIZE) when the device
-      block size is available.
-      On most systems, the buffer will typically be 128 kilobytes long.
->>>>>>> 36137e46a8c ([3.14] gh-150285: Fix too long docstrings in the io module (GH-150287) (GH-150458))
 
     * "Interactive" text files (files for which isatty() returns True)
       use line buffering.  Other text files use the policy described above