mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-24 20:30:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

gh-129813, PEP 782: Use PyBytesWriter in memoryview (#138836)

Browse source 
Replace PyBytes_FromStringAndSize(NULL, size) with the new public
PyBytesWriter API.
This commit is contained in:
Victor Stinner 2025-09-13 18:36:05 +02:00 • committed by GitHub
parent bb743b684b
commit 703da5e81d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Objects/memoryobject.c
View file

@ -2285,7 +2285,6 @@ memoryview_tobytes_impl(PyMemoryViewObject *self, const char *order)
{
Py_buffer *src = VIEW_ADDR(self);
char ord = 'C';
PyObject *bytes;
CHECK_RELEASED(self);
@ -2303,16 +2302,18 @@ memoryview_tobytes_impl(PyMemoryViewObject *self, const char *order)
}
}
bytes = PyBytes_FromStringAndSize(NULL, src->len);
if (bytes == NULL)
return NULL;
if (PyBuffer_ToContiguous(PyBytes_AS_STRING(bytes), src, src->len, ord) < 0) {
Py_DECREF(bytes);
PyBytesWriter *writer = PyBytesWriter_Create(src->len);
if (writer == NULL) {
return NULL;
}
return bytes;
if (PyBuffer_ToContiguous(PyBytesWriter_GetData(writer),
src, src->len, ord) < 0) {
PyBytesWriter_Discard(writer);
return NULL;
}
return PyBytesWriter_Finish(writer);
}
/*[clinic input]
@ -2344,8 +2345,6 @@ memoryview_hex_impl(PyMemoryViewObject *self, PyObject *sep,
/*[clinic end generated code: output=430ca760f94f3ca7 input=539f6a3a5fb56946]*/
{
Py_buffer *src = VIEW_ADDR(self);
PyObject *bytes;
PyObject *ret;
CHECK_RELEASED(self);
@ -2353,19 +2352,22 @@ memoryview_hex_impl(PyMemoryViewObject *self, PyObject *sep,
return _Py_strhex_with_sep(src->buf, src->len, sep, bytes_per_sep);
}
bytes = PyBytes_FromStringAndSize(NULL, src->len);
if (bytes == NULL)
return NULL;
if (PyBuffer_ToContiguous(PyBytes_AS_STRING(bytes), src, src->len, 'C') < 0) {
Py_DECREF(bytes);
PyBytesWriter *writer = PyBytesWriter_Create(src->len);
if (writer == NULL) {
return NULL;
}
ret = _Py_strhex_with_sep(
PyBytes_AS_STRING(bytes), PyBytes_GET_SIZE(bytes),
sep, bytes_per_sep);
Py_DECREF(bytes);
if (PyBuffer_ToContiguous(PyBytesWriter_GetData(writer),
src, src->len, 'C') < 0) {
PyBytesWriter_Discard(writer);
return NULL;
}
PyObject *ret = _Py_strhex_with_sep(
PyBytesWriter_GetData(writer),
PyBytesWriter_GetSize(writer),
sep, bytes_per_sep);
PyBytesWriter_Discard(writer);
return ret;
}