Skip to content

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

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
merged 1 commit into from
Sep 18, 2025
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 11 additions & 15 deletions Modules/_io/bufferedio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1789,18 +1789,18 @@ _bufferedreader_read_fast(buffered *self, Py_ssize_t n)
static PyObject *
_bufferedreader_read_generic(buffered *self, Py_ssize_t n)
{
PyObject *res = NULL;
Py_ssize_t current_size, remaining, written;
char *out;

current_size = Py_SAFE_DOWNCAST(READAHEAD(self), Py_off_t, Py_ssize_t);
if (n <= current_size)
return _bufferedreader_read_fast(self, n);

res = PyBytes_FromStringAndSize(NULL, n);
if (res == NULL)
PyBytesWriter *writer = PyBytesWriter_Create(n);
if (writer == NULL) {
goto error;
out = PyBytes_AS_STRING(res);
}
char *out = PyBytesWriter_GetData(writer);

remaining = n;
written = 0;
if (current_size > 0) {
Expand Down Expand Up @@ -1829,11 +1829,9 @@ _bufferedreader_read_generic(buffered *self, Py_ssize_t n)
if (r == 0 || r == -2) {
/* EOF occurred or read() would block. */
if (r == 0 || written > 0) {
if (_PyBytes_Resize(&res, written))
goto error;
return res;
return PyBytesWriter_FinishWithSize(writer, written);
}
Py_DECREF(res);
PyBytesWriter_Discard(writer);
Py_RETURN_NONE;
}
remaining -= r;
Expand All @@ -1853,11 +1851,9 @@ _bufferedreader_read_generic(buffered *self, Py_ssize_t n)
if (r == 0 || r == -2) {
/* EOF occurred or read() would block. */
if (r == 0 || written > 0) {
if (_PyBytes_Resize(&res, written))
goto error;
return res;
return PyBytesWriter_FinishWithSize(writer, written);
}
Py_DECREF(res);
PyBytesWriter_Discard(writer);
Py_RETURN_NONE;
}
if (remaining > r) {
Expand All @@ -1876,10 +1872,10 @@ _bufferedreader_read_generic(buffered *self, Py_ssize_t n)
break;
}

return res;
return PyBytesWriter_Finish(writer);

error:
Py_XDECREF(res);
PyBytesWriter_Discard(writer);
return NULL;
}

Expand Down
Loading