FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-116946: fully implement GC protocol for `_curses_panel.panel` by picnixz · Pull Request #138333 · python/cpython · GitHub

/ cpython Public

gh-116946: fully implement GC protocol for _curses_panel.panel #138333

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
picnixz merged 8 commits into from
Sep 3, 2025
Conversation 20 Commits 8 Checks 53 Files changed
Merged

gh-116946: fully implement GC protocol for _curses_panel.panel #138333

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
93694c8
fully implement GC protocol for `_curses_panel.panel`
picnixz Sep 1, 2025
c05db69
address review comment
picnixz Sep 2, 2025
23a9664
explicitly raise PyErr_FormatUnraisable in `tp_clear`
picnixz Sep 2, 2025
13933a9
explicitly raise PyErr_FormatUnraisable in `tp_clear`
picnixz Sep 2, 2025
bfadf5b
fixup
picnixz Sep 2, 2025
49cf9ea
address review
picnixz Sep 2, 2025
3221127
use Py_DECREF when possible
picnixz Sep 2, 2025
39de85b
handle errors from `tp_clear` in `tp_dealloc`
picnixz Sep 2, 2025
File filter

Filter by extension

Filter by extension .c  (1) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
58 changes: 44 additions & 14 deletions Modules/_curses_panel.c
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -410,8 +410,11 @@ static PyObject *
PyCursesPanel_New(_curses_panel_state *state, PANEL *pan,
PyCursesWindowObject *wo)
{
PyCursesPanelObject *po = PyObject_New(PyCursesPanelObject,
state->PyCursesPanel_Type);
assert(state != NULL);
PyTypeObject *type = state->PyCursesPanel_Type;
assert(type != NULL);
assert(type->tp_alloc != NULL);
PyCursesPanelObject *po = (PyCursesPanelObject *)type->tp_alloc(type, 0);
if (po == NULL) {
return NULL;
}
Expand All @@ -426,20 +429,31 @@ PyCursesPanel_New(_curses_panel_state *state, PANEL *pan,
return (PyObject *)po;
}

static int
PyCursesPanel_Clear(PyObject *op)
{
PyCursesPanelObject *self = _PyCursesPanelObject_CAST(op);
PyObject *extra = (PyObject *)panel_userptr(self->pan);
if (extra != NULL) {
Py_DECREF(extra);
if (set_panel_userptr(self->pan, NULL) == ERR) {
curses_panel_panel_set_error(self, "set_panel_userptr", NULL);
Comment thread
picnixz marked this conversation as resolved.
return -1;
}
}
// self->wo should not be cleared because an associated WINDOW may exist
return 0;
}

static void
PyCursesPanel_Dealloc(PyObject *self)
{
PyObject *tp, *obj;
PyCursesPanelObject *po = _PyCursesPanelObject_CAST(self);
PyTypeObject *tp = Py_TYPE(self);
PyObject_GC_UnTrack(self);

tp = (PyObject *) Py_TYPE(po);
obj = (PyObject *) panel_userptr(po->pan);
if (obj) {
Py_DECREF(obj);
if (set_panel_userptr(po->pan, NULL) == ERR) {
curses_panel_panel_set_error(po, "set_panel_userptr", "__del__");
PyErr_FormatUnraisable("Exception ignored in PyCursesPanel_Dealloc()");
}
PyCursesPanelObject *po = _PyCursesPanelObject_CAST(self);
if (PyCursesPanel_Clear(self) < 0) {
PyErr_FormatUnraisable("Exception ignored in PyCursesPanel_Dealloc()");
}
if (del_panel(po->pan) == ERR && !PyErr_Occurred()) {
curses_panel_panel_set_error(po, "del_panel", "__del__");
Expand All @@ -452,10 +466,20 @@ PyCursesPanel_Dealloc(PyObject *self)
PyErr_FormatUnraisable("Exception ignored in PyCursesPanel_Dealloc()");
}
}
PyObject_Free(po);
tp->tp_free(po);
Py_DECREF(tp);
}

static int
PyCursesPanel_Traverse(PyObject *op, visitproc visit, void *arg)
{
PyCursesPanelObject *self = _PyCursesPanelObject_CAST(op);
Py_VISIT(Py_TYPE(op));
Py_VISIT(panel_userptr(self->pan));
Py_VISIT(self->wo);
return 0;
}

/* panel_above(NULL) returns the bottom panel in the stack. To get
this behaviour we use curses.panel.bottom_panel(). */
/*[clinic input]
Expand Down Expand Up @@ -647,15 +671,21 @@ static PyMethodDef PyCursesPanel_Methods[] = {
/* -------------------------------------------------------*/

static PyType_Slot PyCursesPanel_Type_slots[] = {
{Py_tp_clear, PyCursesPanel_Clear},
{Py_tp_dealloc, PyCursesPanel_Dealloc},
{Py_tp_traverse, PyCursesPanel_Traverse},
{Py_tp_methods, PyCursesPanel_Methods},
{0, 0},
};

static PyType_Spec PyCursesPanel_Type_spec = {
.name = "_curses_panel.panel",
.basicsize = sizeof(PyCursesPanelObject),
.flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_DISALLOW_INSTANTIATION,
.flags = (
Py_TPFLAGS_DEFAULT
| Py_TPFLAGS_DISALLOW_INSTANTIATION
Comment thread
picnixz marked this conversation as resolved.
| Py_TPFLAGS_HAVE_GC
),
.slots = PyCursesPanel_Type_slots
};

Expand Down
Loading
Back | FazBrowse Home | New Git URL