From 9ed31c5e8d9a738411bf545db637790d40b233b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maurycy=20Paw=C5=82owski-Wiero=C5=84ski?= Date: Thu, 19 Nov 2026 23:05:15 +0100 Subject: [PATCH 1/6] up --- Modules/_io/bufferedio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c index 237b6ea53c367a..ce14a3161487dd 100644 --- a/Modules/_io/bufferedio.c +++ b/Modules/_io/bufferedio.c @@ -2324,8 +2324,9 @@ static int bufferedrwpair_clear(PyObject *op) { rwpair *self = rwpair_CAST(op); - Py_CLEAR(self->reader); + /* Let the writer flush before the reader closes a shared raw stream. */ Py_CLEAR(self->writer); + Py_CLEAR(self->reader); Py_CLEAR(self->dict); return 0; } From 07e5cd481bdcf459dce1c9d4f0d3f97467347179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maurycy=20Paw=C5=82owski-Wiero=C5=84ski?= Date: Thu, 19 Nov 2026 23:05:45 +0100 Subject: [PATCH 2/6] news --- .../next/Library/2026-11-19-22-01-29.gh-issue-162246.y3L8nP.rst | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Misc/NEWS.d/next/Library/2026-11-19-22-01-29.gh-issue-162246.y3L8nP.rst diff --git a/Misc/NEWS.d/next/Library/2026-11-19-22-01-29.gh-issue-162246.y3L8nP.rst b/Misc/NEWS.d/next/Library/2026-11-19-22-01-29.gh-issue-162246.y3L8nP.rst new file mode 100644 index 00000000000000..702b38215ed6ef --- /dev/null +++ b/Misc/NEWS.d/next/Library/2026-11-19-22-01-29.gh-issue-162246.y3L8nP.rst @@ -0,0 +1,2 @@ +Fix :class:`io.BufferedRWPair` losing buffered writes on deallocation when the +reader and writer share a raw stream. From bafcd1eb13e504682e232b1df473d35a0b8c1367 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maurycy=20Paw=C5=82owski-Wiero=C5=84ski?= Date: Thu, 19 Nov 2026 23:05:52 +0100 Subject: [PATCH 3/6] test --- Lib/test/test_io/test_bufferedio.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Lib/test/test_io/test_bufferedio.py b/Lib/test/test_io/test_bufferedio.py index 64789821afe59c..c4c906751a27c7 100644 --- a/Lib/test/test_io/test_bufferedio.py +++ b/Lib/test/test_io/test_bufferedio.py @@ -1116,6 +1116,12 @@ def test_write(self): pair.flush() self.assertEqual(w._write_stack, [b"abc", b"def"]) + def test_destructor_flushes_shared_stream(self): + raw = self.MockRawIO() + self.tp(raw, raw).write(b"abc") + support.gc_collect() + self.assertEqual(raw._write_stack, [b"abc"]) + def test_peek(self): pair = self.tp(self.BytesIO(b"abcdef"), self.MockRawIO()) From d617375b04e09cd94546329ef1fcde94a51c4dce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maurycy=20Paw=C5=82owski-Wiero=C5=84ski?= Date: Thu, 19 Nov 2026 23:07:31 +0100 Subject: [PATCH 4/6] too verbose --- Modules/_io/bufferedio.c | 1 - 1 file changed, 1 deletion(-) diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c index ce14a3161487dd..631d4f1ee15796 100644 --- a/Modules/_io/bufferedio.c +++ b/Modules/_io/bufferedio.c @@ -2324,7 +2324,6 @@ static int bufferedrwpair_clear(PyObject *op) { rwpair *self = rwpair_CAST(op); - /* Let the writer flush before the reader closes a shared raw stream. */ Py_CLEAR(self->writer); Py_CLEAR(self->reader); Py_CLEAR(self->dict); From bbb66e7c9c58a77c6b9942e0684595951de1b5e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maurycy=20Paw=C5=82owski-Wiero=C5=84ski?= Date: Thu, 19 Nov 2026 23:20:13 +0100 Subject: [PATCH 5/6] raw._write_stack --- Lib/test/test_io/test_bufferedio.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_io/test_bufferedio.py b/Lib/test/test_io/test_bufferedio.py index c4c906751a27c7..997e335591b483 100644 --- a/Lib/test/test_io/test_bufferedio.py +++ b/Lib/test/test_io/test_bufferedio.py @@ -1118,7 +1118,10 @@ def test_write(self): def test_destructor_flushes_shared_stream(self): raw = self.MockRawIO() - self.tp(raw, raw).write(b"abc") + pair = self.tp(raw, raw) + pair.write(b"abc") + self.assertEqual(raw._write_stack, []) + del pair support.gc_collect() self.assertEqual(raw._write_stack, [b"abc"]) From e2aa79a4d34978a53f65731073062cd10877d7af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maurycy=20Paw=C5=82owski-Wiero=C5=84ski?= Date: Fri, 20 Nov 2026 11:37:04 +0100 Subject: [PATCH 6/6] comment --- Modules/_io/bufferedio.c | 1 + 1 file changed, 1 insertion(+) diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c index 631d4f1ee15796..ce14a3161487dd 100644 --- a/Modules/_io/bufferedio.c +++ b/Modules/_io/bufferedio.c @@ -2324,6 +2324,7 @@ static int bufferedrwpair_clear(PyObject *op) { rwpair *self = rwpair_CAST(op); + /* Let the writer flush before the reader closes a shared raw stream. */ Py_CLEAR(self->writer); Py_CLEAR(self->reader); Py_CLEAR(self->dict);