From 48a69100da90a747a6bd3d98a885ec68e0495521 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maurycy=20Paw=C5=82owski-Wiero=C5=84ski?= Date: Wed, 18 Nov 2026 18:26:52 +0100 Subject: [PATCH 1/5] up --- Lib/_pyio.py | 3 +++ Lib/test/test_io/test_bufferedio.py | 14 ++++++++++++ Modules/_io/bufferedio.c | 14 ++++++++++++ Modules/_io/clinic/bufferedio.c.h | 33 ++++++++++++++++++++++++++++- 4 files changed, 63 insertions(+), 1 deletion(-) diff --git a/Lib/_pyio.py b/Lib/_pyio.py index 77239f026efbb17..57a442319742e98 100644 --- a/Lib/_pyio.py +++ b/Lib/_pyio.py @@ -1404,6 +1404,9 @@ def peek(self, size=0): def read1(self, size=-1): return self.reader.read1(size) + def readline(self, size=-1): + return self.reader.readline(size) + def readinto1(self, b): return self.reader.readinto1(b) diff --git a/Lib/test/test_io/test_bufferedio.py b/Lib/test/test_io/test_bufferedio.py index e83dd0d4e28d006..ce594762c325ac0 100644 --- a/Lib/test/test_io/test_bufferedio.py +++ b/Lib/test/test_io/test_bufferedio.py @@ -1057,6 +1057,20 @@ def test_read(self): pair = self.tp(self.BytesIO(b"abc"), self.MockRawIO()) self.assertEqual(pair.read(None), b"abc") + def test_readline(self): + pair = self.tp(self.BytesIO(b"ab\ncd"), self.MockRawIO()) + + self.assertEqual(pair.readline(1), b"a") + self.assertEqual(pair.readline(5), b"b\n") + self.assertEqual(pair.readline(0), b"") + self.assertEqual(pair.readline(None), b"cd") + + def test_readline_nonblocking(self): + raw = self.MockRawIO([b"abc", None, None]) + pair = self.tp(raw, self.MockRawIO()) + + self.assertEqual(pair.readline(), b"abc") + def test_readlines(self): pair = lambda: self.tp(self.BytesIO(b"abc\ndef\nh"), self.MockRawIO()) self.assertEqual(pair().readlines(), [b"abc\n", b"def\n", b"h"]) diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c index 44c3f56caee18b6..d6bec8853f80f5e 100644 --- a/Modules/_io/bufferedio.c +++ b/Modules/_io/bufferedio.c @@ -2394,6 +2394,19 @@ _io_BufferedRWPair_read1_impl(rwpair *self, PyObject *size) return _forward_call(self->reader, &_Py_ID(read1), size); } +/*[clinic input] +_io.BufferedRWPair.readline + size: object(c_default="NULL") = -1 + / +[clinic start generated code]*/ + +static PyObject * +_io_BufferedRWPair_readline_impl(rwpair *self, PyObject *size) +/*[clinic end generated code: output=ee5bb2364231e6e1 input=d29b33e6efa2f69e]*/ +{ + return _forward_call(self->reader, &_Py_ID(readline), size); +} + /*[clinic input] _io.BufferedRWPair.readinto buffer: object @@ -2735,6 +2748,7 @@ static PyMethodDef bufferedrwpair_methods[] = { _IO_BUFFEREDRWPAIR_READ_METHODDEF _IO_BUFFEREDRWPAIR_PEEK_METHODDEF _IO_BUFFEREDRWPAIR_READ1_METHODDEF + _IO_BUFFEREDRWPAIR_READLINE_METHODDEF _IO_BUFFEREDRWPAIR_READINTO_METHODDEF _IO_BUFFEREDRWPAIR_READINTO1_METHODDEF diff --git a/Modules/_io/clinic/bufferedio.c.h b/Modules/_io/clinic/bufferedio.c.h index a85dd6a20bc2c1d..a9df2a6ced42352 100644 --- a/Modules/_io/clinic/bufferedio.c.h +++ b/Modules/_io/clinic/bufferedio.c.h @@ -1197,6 +1197,37 @@ _io_BufferedRWPair_read1(PyObject *self, PyObject *const *args, Py_ssize_t nargs return return_value; } +PyDoc_STRVAR(_io_BufferedRWPair_readline__doc__, +"readline($self, size=-1, /)\n" +"--\n" +"\n"); + +#define _IO_BUFFEREDRWPAIR_READLINE_METHODDEF \ + {"readline", _PyCFunction_CAST(_io_BufferedRWPair_readline), METH_FASTCALL, _io_BufferedRWPair_readline__doc__}, + +static PyObject * +_io_BufferedRWPair_readline_impl(rwpair *self, PyObject *size); + +static PyObject * +_io_BufferedRWPair_readline(PyObject *self, PyObject *const *args, Py_ssize_t nargs) +{ + PyObject *return_value = NULL; + PyObject *size = NULL; + + if (!_PyArg_CheckPositional("readline", nargs, 0, 1)) { + goto exit; + } + if (nargs < 1) { + goto skip_optional; + } + size = args[0]; +skip_optional: + return_value = _io_BufferedRWPair_readline_impl((rwpair *)self, size); + +exit: + return return_value; +} + PyDoc_STRVAR(_io_BufferedRWPair_readinto__doc__, "readinto($self, buffer, /)\n" "--\n" @@ -1441,4 +1472,4 @@ _io_BufferedRandom___init__(PyObject *self, PyObject *args, PyObject *kwargs) #define _IO_BUFFEREDRWPAIR_CLOSED_GETSETDEF {"closed", (getter)_io_BufferedRWPair_closed_get, (setter)NULL, NULL}, -/*[clinic end generated code: output=d9e1eb0efa4a2431 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=72a25273214309c9 input=a9049054013a1b77]*/ From 11fae03794193762746560d24f6466d16014d7ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maurycy=20Paw=C5=82owski-Wiero=C5=84ski?= Date: Wed, 18 Nov 2026 18:32:01 +0100 Subject: [PATCH 2/5] news --- .../next/Library/2026-11-18-18-28-37.gh-issue-162230.ezR86S.rst | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Misc/NEWS.d/next/Library/2026-11-18-18-28-37.gh-issue-162230.ezR86S.rst diff --git a/Misc/NEWS.d/next/Library/2026-11-18-18-28-37.gh-issue-162230.ezR86S.rst b/Misc/NEWS.d/next/Library/2026-11-18-18-28-37.gh-issue-162230.ezR86S.rst new file mode 100644 index 000000000000000..58befefbfc7cc77 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2026-11-18-18-28-37.gh-issue-162230.ezR86S.rst @@ -0,0 +1,2 @@ +Speed up :meth:`!io.BufferedRWPair.readline`. If a non-blocking read would +block, return the bytes read so far. From 60ff091f7fd36f25263d106564a53d8ba6e15a60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maurycy=20Paw=C5=82owski-Wiero=C5=84ski?= Date: Wed, 18 Nov 2026 23:51:39 +0100 Subject: [PATCH 3/5] news --- .../Library/2026-11-18-18-28-37.gh-issue-162230.ezR86S.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Misc/NEWS.d/next/Library/2026-11-18-18-28-37.gh-issue-162230.ezR86S.rst b/Misc/NEWS.d/next/Library/2026-11-18-18-28-37.gh-issue-162230.ezR86S.rst index 58befefbfc7cc77..00b96c972ece6f6 100644 --- a/Misc/NEWS.d/next/Library/2026-11-18-18-28-37.gh-issue-162230.ezR86S.rst +++ b/Misc/NEWS.d/next/Library/2026-11-18-18-28-37.gh-issue-162230.ezR86S.rst @@ -1,2 +1,3 @@ Speed up :meth:`!io.BufferedRWPair.readline`. If a non-blocking read would -block, return the bytes read so far. +block, return the bytes read so far (possibly ``b''``). Previously, it raised +:exc:`OSError`. From d5337eaf02391339a77f325a7c79281d8052b913 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maurycy=20Paw=C5=82owski-Wiero=C5=84ski?= Date: Wed, 18 Nov 2026 23:52:26 +0100 Subject: [PATCH 4/5] readline.__doc__ --- Lib/_pyio.py | 2 ++ Modules/_io/bufferedio.c | 10 +++++++++- Modules/_io/clinic/bufferedio.c.h | 11 +++++++++-- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Lib/_pyio.py b/Lib/_pyio.py index 57a442319742e98..77c7f60b9efa8fd 100644 --- a/Lib/_pyio.py +++ b/Lib/_pyio.py @@ -1407,6 +1407,8 @@ def read1(self, size=-1): def readline(self, size=-1): return self.reader.readline(size) + readline.__doc__ = BufferedReader.readline.__doc__ + def readinto1(self, b): return self.reader.readinto1(b) diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c index d6bec8853f80f5e..db02b9e735b18fc 100644 --- a/Modules/_io/bufferedio.c +++ b/Modules/_io/bufferedio.c @@ -2398,11 +2398,19 @@ _io_BufferedRWPair_read1_impl(rwpair *self, PyObject *size) _io.BufferedRWPair.readline size: object(c_default="NULL") = -1 / + +Read and return a line from the stream. + +If size is specified, at most size bytes will be read. + +The line terminator is always b'\n' for binary files; for text +files, the newlines argument to open can be used to select the line +terminator(s) recognized. [clinic start generated code]*/ static PyObject * _io_BufferedRWPair_readline_impl(rwpair *self, PyObject *size) -/*[clinic end generated code: output=ee5bb2364231e6e1 input=d29b33e6efa2f69e]*/ +/*[clinic end generated code: output=ee5bb2364231e6e1 input=8ef2d3e003f34c31]*/ { return _forward_call(self->reader, &_Py_ID(readline), size); } diff --git a/Modules/_io/clinic/bufferedio.c.h b/Modules/_io/clinic/bufferedio.c.h index a9df2a6ced42352..00d3f4e3657bcda 100644 --- a/Modules/_io/clinic/bufferedio.c.h +++ b/Modules/_io/clinic/bufferedio.c.h @@ -1200,7 +1200,14 @@ _io_BufferedRWPair_read1(PyObject *self, PyObject *const *args, Py_ssize_t nargs PyDoc_STRVAR(_io_BufferedRWPair_readline__doc__, "readline($self, size=-1, /)\n" "--\n" -"\n"); +"\n" +"Read and return a line from the stream.\n" +"\n" +"If size is specified, at most size bytes will be read.\n" +"\n" +"The line terminator is always b\'\\n\' for binary files; for text\n" +"files, the newlines argument to open can be used to select the line\n" +"terminator(s) recognized."); #define _IO_BUFFEREDRWPAIR_READLINE_METHODDEF \ {"readline", _PyCFunction_CAST(_io_BufferedRWPair_readline), METH_FASTCALL, _io_BufferedRWPair_readline__doc__}, @@ -1472,4 +1479,4 @@ _io_BufferedRandom___init__(PyObject *self, PyObject *args, PyObject *kwargs) #define _IO_BUFFEREDRWPAIR_CLOSED_GETSETDEF {"closed", (getter)_io_BufferedRWPair_closed_get, (setter)NULL, NULL}, -/*[clinic end generated code: output=72a25273214309c9 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=4c99c7646c6e959d input=a9049054013a1b77]*/ From 8cfd667d67ed1fd01125c51786aa53640444c742 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maurycy=20Paw=C5=82owski-Wiero=C5=84ski?= Date: Thu, 19 Nov 2026 00:23:28 +0100 Subject: [PATCH 5/5] no text --- Lib/_pyio.py | 8 ++++++-- Modules/_io/bufferedio.c | 6 ++---- Modules/_io/clinic/bufferedio.c.h | 6 ++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Lib/_pyio.py b/Lib/_pyio.py index 77c7f60b9efa8fd..21f40add53593b4 100644 --- a/Lib/_pyio.py +++ b/Lib/_pyio.py @@ -1405,9 +1405,13 @@ def read1(self, size=-1): return self.reader.read1(size) def readline(self, size=-1): - return self.reader.readline(size) + r"""Read and return a line from the stream. + + If size is specified, at most size bytes will be read. - readline.__doc__ = BufferedReader.readline.__doc__ + The line terminator is always b'\n'. + """ + return self.reader.readline(size) def readinto1(self, b): return self.reader.readinto1(b) diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c index db02b9e735b18fc..757e6a10558e485 100644 --- a/Modules/_io/bufferedio.c +++ b/Modules/_io/bufferedio.c @@ -2403,14 +2403,12 @@ Read and return a line from the stream. If size is specified, at most size bytes will be read. -The line terminator is always b'\n' for binary files; for text -files, the newlines argument to open can be used to select the line -terminator(s) recognized. +The line terminator is always b'\n'. [clinic start generated code]*/ static PyObject * _io_BufferedRWPair_readline_impl(rwpair *self, PyObject *size) -/*[clinic end generated code: output=ee5bb2364231e6e1 input=8ef2d3e003f34c31]*/ +/*[clinic end generated code: output=ee5bb2364231e6e1 input=1c552272a69db1ad]*/ { return _forward_call(self->reader, &_Py_ID(readline), size); } diff --git a/Modules/_io/clinic/bufferedio.c.h b/Modules/_io/clinic/bufferedio.c.h index 00d3f4e3657bcda..0cedf4a9948e9da 100644 --- a/Modules/_io/clinic/bufferedio.c.h +++ b/Modules/_io/clinic/bufferedio.c.h @@ -1205,9 +1205,7 @@ PyDoc_STRVAR(_io_BufferedRWPair_readline__doc__, "\n" "If size is specified, at most size bytes will be read.\n" "\n" -"The line terminator is always b\'\\n\' for binary files; for text\n" -"files, the newlines argument to open can be used to select the line\n" -"terminator(s) recognized."); +"The line terminator is always b\'\\n\'."); #define _IO_BUFFEREDRWPAIR_READLINE_METHODDEF \ {"readline", _PyCFunction_CAST(_io_BufferedRWPair_readline), METH_FASTCALL, _io_BufferedRWPair_readline__doc__}, @@ -1479,4 +1477,4 @@ _io_BufferedRandom___init__(PyObject *self, PyObject *args, PyObject *kwargs) #define _IO_BUFFEREDRWPAIR_CLOSED_GETSETDEF {"closed", (getter)_io_BufferedRWPair_closed_get, (setter)NULL, NULL}, -/*[clinic end generated code: output=4c99c7646c6e959d input=a9049054013a1b77]*/ +/*[clinic end generated code: output=1596bb353f00a1ea input=a9049054013a1b77]*/