Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-01-06 15:32:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Replace PyBytes_FromStringAndSize(NULL, size) and _PyBytes_Resize()
with the new public PyBytesWriter API.
This commit is contained in:
Victor Stinner 2025-09-18 16:00:10 +01:00 • committed by GitHub
parent 446587c58e
commit 9b35f7cdfe
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Modules/_io/bufferedio.c
View file

@ -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) {
@ -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;
@ -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) {
@ -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;
}