1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
From 504cecd58b1409b6bb77d48f83ed77cac106892a Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <[email protected]>
Date: Thu, 11 Jun 2026 13:27:35 +0300
Subject: [PATCH] [3.13] gh-150285: Fix merging error in GH-150458
---
Lib/_pyio.py | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/Lib/_pyio.py b/Lib/_pyio.py
index 4ac60b5ee15ff1c..7c1635cb3310695 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
|
