Skip to content

gh-129813, PEP 782: Use PyBytesWriter in bufferedio.c #138954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 2 commits into from
Sep 15, 2025
Merged

gh-129813, PEP 782: Use PyBytesWriter in bufferedio.c #138954

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ca682e
gh-129813, PEP 782: Use PyBytesWriter in bufferedio.c
vstinner Sep 15, 2025
dd3f975
Address cmaloney's review
vstinner Sep 15, 2025
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
Prev Previous commit
Address cmaloney's review 
Move PyBytesWriter_Create() call
  • Loading branch information
@vstinner
vstinner committed Sep 15, 2025
commit dd3f975156c9c5b0ca3c912dac2fef4d3d1ad771
13 changes: 7 additions & 6 deletions Modules/_io/bufferedio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1048,25 +1048,26 @@ _io__Buffered_read1_impl(buffered *self, Py_ssize_t n)
return res;
}

PyBytesWriter *writer = PyBytesWriter_Create(n);
if (writer == NULL) {
return NULL;
}
if (!ENTER_BUFFERED(self)) {
PyBytesWriter_Discard(writer);
return NULL;
}

/* Flush the write buffer if necessary */
if (self->writable) {
PyObject *res = buffered_flush_and_rewind_unlocked(self);
if (res == NULL) {
LEAVE_BUFFERED(self)
PyBytesWriter_Discard(writer);
return NULL;
}
Py_DECREF(res);
}
_bufferedreader_reset_buf(self);

PyBytesWriter *writer = PyBytesWriter_Create(n);
if (writer == NULL) {
return NULL;
}

Py_ssize_t r = _bufferedreader_raw_read(self,
PyBytesWriter_GetData(writer), n);
LEAVE_BUFFERED(self)
Expand Down
Loading