8000 gh-125843: fix `test_curses.test_attributes` on x86-64 macOS by picnixz · Pull Request #134252 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-125843: fix test_curses.test_attributes on x86-64 macOS #134252

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 8 commits into from
May 20, 2025
Merged

gh-125843: fix test_curses.test_attributes on x86-64 macOS #134252

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9f71ec7
improve traceback when reporting unexpected curses errors
picnixz May 19, 2025
0d01ade
fix compilation
picnixz May 19, 2025
8fcdb53
fix reporting of `derwin` errors
picnixz May 19, 2025
9c7d960
fix assertion
picnixz May 19, 2025
e49e11b
fixup comment
picnixz May 19, 2025
12d8805
Merge remote-tracking branch 'upstream/main' into patch/curses-checks…
picnixz May 19, 2025
8004b3d
Merge remote-tracking branch 'upstream/main' into patch/curses-checks…
picnixz May 19, 2025
088dc79
remove dead code
picnixz May 20, 2025
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
10 changes: 4 additions & 6 deletions Modules/_cursesmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,17 +392,16 @@ _PyCursesStatefulCheckFunction(PyObject *module,
*/

/*
* Return None if 'code' is OK. Otherwise, set an exception
* using curses_set_error() and the remaining arguments, and
* return NULL.
* Return None if 'code' is different from ERR (implementation-defined).
* Otherwise, set an exception using curses_set_error() and the remaining
* arguments, and return NULL.
*/
static PyObject *
curses_check_err(PyObject *module, int code,
const char *curses_funcname,
const char *python_funcname)
{
if (code != ERR) {
assert(code == OK);
Py_RETURN_NONE;
}
curses_set_error(module, curses_funcname, python_funcname);
Expand All @@ -416,7 +415,6 @@ curses_window_check_err(PyCursesWindowObject *win, int code,
const char *python_funcname)
{
if (code != ERR) {
assert(code == OK);
Py_RETURN_NONE;
}
curses_window_set_error(win, curses_funcname, python_funcname);
Expand Down Expand Up @@ -1580,7 +1578,7 @@ _curses_window_derwin_impl(PyCursesWindowObject *self, int group_left_1,
win = derwin(self->win,nlines,ncols,begin_y,begin_x);

if (win == NULL) {
curses_window_set_error(self, "derwin", NULL);
curses_window_set_null_error(self, "derwin", NULL);
return NULL;
}

Expand Down
Loading
0