https://github.com/python/cpython/commit/21c80cadc840265db533a2bdd07f717716209fde
commit: 21c80cadc840265db533a2bdd07f717716209fde
branch: main
author: Victor Stinner <[email protected]>
committer: vstinner <[email protected]>
date: 2025-09-15T16:24:34+02:00
summary:
gh-129813, PEP 782: Use PyBytesWriter in _curses (#138920)
Replace PyBytes_FromStringAndSize(NULL, size) and _PyBytes_Resize()
with the new public PyBytesWriter API.
files:
M Modules/_cursesmodule.c
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index 232dbcace9ac57..61464348d6fab8 100644
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -1932,7 +1932,6 @@ PyCursesWindow_getstr(PyObject *op, PyObject *args)
int rtn, use_xy = 0, y = 0, x = 0;
unsigned int max_buf_size = 2048;
unsigned int n = max_buf_size - 1;
- PyObject *res;
if (!curses_clinic_parse_optional_xy_n(args, &y, &x, &n, &use_xy,
"_curses.window.instr"))
@@ -1941,11 +1940,11 @@ PyCursesWindow_getstr(PyObject *op, PyObject *args)
}
n = Py_MIN(n, max_buf_size - 1);
- res = PyBytes_FromStringAndSize(NULL, n + 1);
- if (res == NULL) {
+ PyBytesWriter *writer = PyBytesWriter_Create(n + 1);
+ if (writer == NULL) {
return NULL;
}
- char *buf = PyBytes_AS_STRING(res);
+ char *buf = PyBytesWriter_GetData(writer);
if (use_xy) {
Py_BEGIN_ALLOW_THREADS
@@ -1965,11 +1964,10 @@ PyCursesWindow_getstr(PyObject *op, PyObject *args)
}
if (rtn == ERR) {
- Py_DECREF(res);
+ PyBytesWriter_Discard(writer);
return Py_GetConstant(Py_CONSTANT_EMPTY_BYTES);
}
- _PyBytes_Resize(&res, strlen(buf)); // 'res' is set to NULL on failure
- return res;
+ return PyBytesWriter_FinishWithSize(writer, strlen(buf));
}
/*[clinic input]
@@ -2130,7 +2128,6 @@ PyCursesWindow_instr(PyObject *op, PyObject *args)
int rtn, use_xy = 0, y = 0, x = 0;
unsigned int max_buf_size = 2048;
unsigned int n = max_buf_size - 1;
- PyObject *res;
if (!curses_clinic_parse_optional_xy_n(args, &y, &x, &n, &use_xy,
"_curses.window.instr"))
@@ -2139,11 +2136,11 @@ PyCursesWindow_instr(PyObject *op, PyObject *args)
}
n = Py_MIN(n, max_buf_size - 1);
- res = PyBytes_FromStringAndSize(NULL, n + 1);
- if (res == NULL) {
+ PyBytesWriter *writer = PyBytesWriter_Create(n + 1);
+ if (writer == NULL) {
return NULL;
}
- char *buf = PyBytes_AS_STRING(res);
+ char *buf = PyBytesWriter_GetData(writer);
if (use_xy) {
rtn = mvwinnstr(self->win, y, x, buf, n);
@@ -2153,11 +2150,10 @@ PyCursesWindow_instr(PyObject *op, PyObject *args)
}
if (rtn == ERR) {
- Py_DECREF(res);
+ PyBytesWriter_Discard(writer);
return Py_GetConstant(Py_CONSTANT_EMPTY_BYTES);
}
- _PyBytes_Resize(&res, strlen(buf)); // 'res' is set to NULL on failure
- return res;
+ return PyBytesWriter_FinishWithSize(writer, strlen(buf));
}
/*[clinic input]
_______________________________________________
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]
