Skip to content

gh-123961: Improve curses C API cleanup #124907

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
vstinner merged 6 commits into from
Oct 3, 2024
Merged

gh-123961: Improve curses C API cleanup #124907

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9275512
Improve curses C API cleanup
picnixz Oct 2, 2024
42c4c14
remove traverse() and clear() for now
picnixz Oct 2, 2024
dd0c9de
revert includes
picnixz Oct 2, 2024
8528eb9
address Victor's review
picnixz Oct 3, 2024
6a8803f
Apply suggestions from code review
vstinner Oct 3, 2024
d6bed09
simplify function names
picnixz Oct 3, 2024
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
Prev Previous commit
Next Next commit
remove traverse() and clear() for now
  • Loading branch information
@picnixz
picnixz committed Oct 2, 2024
commit 42c4c14913a328a545e66cd27156b6cf4237f965
37 changes: 0 additions & 37 deletions Modules/_cursesmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4892,48 +4892,11 @@ _curses_capi_capsule_destructor(PyObject *op)
_curses_capi_free(capi);
}

static int
_curses_capi_capsule_traverse(PyObject *op, visitproc visit, void *arg)
{
void *capi = PyCapsule_GetPointer(op, PyCurses_CAPSULE_NAME);
assert(capi != NULL);
void *window_type = *(void **)(capi);
assert(window_type != NULL);
if (_PyType_HasFeature(_PyType_CAST(window_type), Py_TPFLAGS_HEAPTYPE)) {
Py_VISIT(window_type);
}
return 0;
}

static int
_curses_capi_capsule_clear(PyObject *op) {
void *capi = PyCapsule_GetPointer(op, PyCurses_CAPSULE_NAME);
assert(capi != NULL);
void *window_type = *(void **)(capi);
if (_PyType_HasFeature(_PyType_CAST(window_type), Py_TPFLAGS_HEAPTYPE)) {
Py_CLEAR(window_type);
}
return 0;
}

static PyObject *
_curses_capi_capsule_new(void *capi)
{
PyObject *capsule = PyCapsule_New(capi, PyCurses_CAPSULE_NAME,
_curses_capi_capsule_destructor);
if (capsule == NULL) {
return NULL;
}
void *window_type = *(void **)(capi);
if (_PyType_HasFeature(_PyType_CAST(window_type), Py_TPFLAGS_HEAPTYPE)) {
if (_PyCapsule_SetTraverse(capsule,
_curses_capi_capsule_traverse,
_curses_capi_capsule_clear) < 0)
{
Py_DECREF(capsule);
return NULL;
}
}
return capsule;
}

Expand Down