Skip to content

gh-129813, PEP 782: Use PyBytesWriter in _curses #138920

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 15, 2025
Merged

gh-129813, PEP 782: Use PyBytesWriter in _curses #138920

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
24 changes: 10 additions & 14 deletions Modules/_cursesmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand All @@ -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
Expand All @@ -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]
Expand Down Expand Up @@ -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"))
Expand All @@ -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);
Expand All @@ -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]
Expand Down
Loading