Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Lib/test/test_io/test_bufferedio.py
Original file line number Diff line number Diff line change
Expand Up @@ -1116,6 +1116,15 @@ 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()
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"])

def test_peek(self):
pair = self.tp(self.BytesIO(b"abcdef"), self.MockRawIO())

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix :class:`io.BufferedRWPair` losing buffered writes on deallocation when the
reader and writer share a raw stream.
3 changes: 2 additions & 1 deletion Modules/_io/bufferedio.c
Original file line number Diff line number Diff line change
Expand Up @@ -2318,8 +2318,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);
PyObject_ClearManagedDict(op);
return 0;
}
Expand Down
Loading