https://github.com/python/cpython/commit/9b35f7cdfedc1835f36b87662617fb60d06fe412
commit: 9b35f7cdfedc1835f36b87662617fb60d06fe412
branch: main
author: Victor Stinner <[email protected]>
committer: vstinner <[email protected]>
date: 2025-09-18T17:00:10+02:00
summary:
gh-129813, PEP 782: Use PyBytesWriter in bufferedio.c (#139121)
Replace PyBytes_FromStringAndSize(NULL, size) and _PyBytes_Resize()
with the new public PyBytesWriter API.
files:
M Modules/_io/bufferedio.c
diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c
index 2d2559c8219230..0a2b35025321cf 100644
--- a/Modules/_io/bufferedio.c
+++ b/Modules/_io/bufferedio.c
@@ -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;
}
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]
