mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-24 02:15:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

gh-115059: Flush the underlying write buffer in io.BufferedRandom.read1() (GH-115163)

Browse Source
This commit is contained in:
Serhiy Storchaka 2024-02-09 12:36:12 +02:00 committed by GitHub
parent c968dc7ff3
commit 846fd721d5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 63 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
Lib/test/test_io.py
View File

@ -2497,6 +2497,28 @@ class BufferedRandomTest(BufferedReaderTest, BufferedWriterTest):
f.flush()
self.assertEqual(raw.getvalue(), b'a2c')
def test_read1_after_write(self):
with self.BytesIO(b'abcdef') as raw:
with self.tp(raw, 3) as f:
f.write(b"1")
self.assertEqual(f.read1(1), b'b')
f.flush()
self.assertEqual(raw.getvalue(), b'1bcdef')
with self.BytesIO(b'abcdef') as raw:
with self.tp(raw, 3) as f:
f.write(b"1")
self.assertEqual(f.read1(), b'bcd')
f.flush()
self.assertEqual(raw.getvalue(), b'1bcdef')
with self.BytesIO(b'abcdef') as raw:
with self.tp(raw, 3) as f:
f.write(b"1")
# XXX: read(100) returns different numbers of bytes
# in Python and C implementations.
self.assertEqual(f.read1(100)[:3], b'bcd')
f.flush()
self.assertEqual(raw.getvalue(), b'1bcdef')
def test_interleaved_readline_write(self):
with self.BytesIO(b'ab\ncdef\ng\n') as raw:
with self.tp(raw) as f:
@ -2509,6 +2531,36 @@ class BufferedRandomTest(BufferedReaderTest, BufferedWriterTest):
f.flush()
self.assertEqual(raw.getvalue(), b'1b\n2def\n3\n')
def test_xxx(self):
with self.BytesIO(b'abcdefgh') as raw:
with self.tp(raw) as f:
f.write(b'123')
self.assertEqual(f.read(), b'defgh')
f.write(b'456')
f.flush()
self.assertEqual(raw.getvalue(), b'123defgh456')
with self.BytesIO(b'abcdefgh') as raw:
with self.tp(raw) as f:
f.write(b'123')
self.assertEqual(f.read(3), b'def')
f.write(b'456')
f.flush()
self.assertEqual(raw.getvalue(), b'123def456')
with self.BytesIO(b'abcdefgh') as raw:
with self.tp(raw) as f:
f.write(b'123')
self.assertEqual(f.read1(), b'defgh')
f.write(b'456')
f.flush()
self.assertEqual(raw.getvalue(), b'123defgh456')
with self.BytesIO(b'abcdefgh') as raw:
with self.tp(raw) as f:
f.write(b'123')
self.assertEqual(f.read1(3), b'def')
f.write(b'456')
f.flush()
self.assertEqual(raw.getvalue(), b'123def456')
# You can't construct a BufferedRandom over a non-seekable stream.
test_unseekable = None

1
Misc/NEWS.d/next/Library/2024-02-08-13-26-14.gh-issue-115059.DqP9dr.rst Normal file
View File

@ -0,0 +1 @@
:meth:`io.BufferedRandom.read1` now flushes the underlying write buffer.

10
Modules/_io/bufferedio.c
View File

@ -1050,6 +1050,16 @@ _io__Buffered_read1_impl(buffered *self, Py_ssize_t n)
Py_DECREF(res);
return NULL;
}
/* Flush the write buffer if necessary */
if (self->writable) {
PyObject *r = buffered_flush_and_rewind_unlocked(self);
if (r == NULL) {
LEAVE_BUFFERED(self)
Py_DECREF(res);
return NULL;
}
Py_DECREF(r);
}
_bufferedreader_reset_buf(self);
r = _bufferedreader_raw_read(self, PyBytes_AS_STRING(res), n);
LEAVE_BUFFERED(self)