8000 bpo-1635741 port _curses_panel to multi-phase init (PEP 489) by koubaa · Pull Request #21986 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-1635741 port _curses_panel to multi-phase init (PEP 489) #21986

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 16 commits into from
Sep 7, 2020
Merged

bpo-1635741 port _curses_panel to multi-phase init (PEP 489) #21986

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
03e4fce
port _curses_panel to multi-phase
koubaa Aug 11, 2020
95081a7
blurb
koubaa Sep 1, 2020
c9e4c9e
remove global module state
koubaa Sep 2, 2020
ba012cf
regen clinic file on linux
Sep 2, 2020
14a6027
rename variable & fix issue
koubaa Sep 2, 2020
d0a6d8a
remove unnecessary cast
koubaa Sep 3, 2020
50751c2
fix compiler warning
koubaa Sep 3, 2020
174c64e
fix
koubaa Sep 5, 2020
8d1a790
fix build error
koubaa Sep 6, 2020
34e4374
fix warning
koubaa Sep 7, 2020
f9b5d9f
fix compiler warning
koubaa Sep 7, 2020
f4274ed
fix issue
koubaa Sep 7, 2020
1213b35
update
koubaa Sep 7, 2020
ea0136d
fix compile error
koubaa Sep 7, 2020
141c299
fix
koubaa Sep 7, 2020
4a9bf93
rename
koubaa Sep 7, 2020
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 global module state
  • Loading branch information
@koubaa
koubaa committed Sep 2, 2020
commit c9e4c9ef0595153b896c1fdad0e64db91625c40e
144 changes: 85 additions & 59 deletions Modules/_curses_panel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,6 @@ _curses_panel_free(void *m)
_curses_panel_clear((PyObject *) m);
}

static struct PyModuleDef _curses_panelmodule;

#define _curses_panelstate_global \
((_curses_panelstate *) PyModule_GetState(PyState_FindModule(&_curses_panelmodule)))

/* Utility Functions */

/*
Expand All @@ -63,15 +58,17 @@ static struct PyModuleDef _curses_panelmodule;
*/

static PyObject *
PyCursesCheckERR(int code, const char *fname)
PyCursesCheckERR(_curses_panelstate *st, int code, const char *fname)
{
if (code != ERR) {
Py_RETURN_NONE;
} else {
}
else {
if (fname == NULL) {
PyErr_SetString(_curses_panelstate_global->PyCursesError, catchall_ERR);
} else {
PyErr_Format(_curses_panelstate_global->PyCursesError, "%s() returned ERR", fname);
PyErr_SetString(st->PyCursesError, catchall_ERR);
}
else {
PyErr_Format(st->PyCursesError, "%s() returned ERR", fname);
}
return NULL;
}
Expand All @@ -89,9 +86,6 @@ typedef struct {
PyCursesWindowObject *wo; /* for reference counts */
} PyCursesPanelObject;

#define PyCursesPanel_Check(v) \
Py_IS_TYPE(v, _curses_panelstate_global->PyCursesPanel_Type)

/* Some helper functions. The problem is that there's always a window
associated with a panel. To ensure that Python's GC doesn't pull
this window from under our feet we need to keep track of references
Expand Down Expand Up @@ -182,67 +176,83 @@ class _curses_panel.panel "PyCursesPanelObject *" "&PyCursesPanel_Type"
/*[clinic input]
_curses_panel.panel.bottom

cls: defining_class

Push the panel to the bottom of the stack.
[clinic start generated code]*/

static PyObject *
_curses_panel_panel_bottom_impl(PyCursesPanelObject *self)
/*[clinic end generated code: output=7aa7d14d7e1d1ce6 input=b6c920c071b61e2e]*/
_curses_panel_panel_bottom_impl(PyCursesPanelObject *self, PyTypeObject *cls)
/*[clinic end generated code: output=8ec7fbbc08554021 input=6b7d2c0578b5a1c4]*/
{
return PyCursesCheckERR(bottom_panel(self->pan), "bottom");
_curses_panelstate *st = (_curses_panelstate *)PyType_GetModuleState(cls);

return PyCursesCheckERR(st, bottom_panel(self->pan), "bottom");
}

/*[clinic input]
_curses_panel.panel.hide

cls: defining_class

Hide the panel.

This does not delete the object, it just makes the window on screen invisible.
[clinic start generated code]*/

static PyObject *
_curses_panel_panel_hide_impl(PyCursesPanelObject *self)
/*[clinic end generated code: output=a7bbbd523e1eab49 input=f6ab884e99386118]*/
_curses_panel_panel_hide_impl(PyCursesPanelObject *self, PyTypeObject *cls)
/*[clinic end generated code: output=cc6ab7203cdc1450 input=1bfc741f473e6055]*/
{
return PyCursesCheckERR(hide_panel(self->pan), "hide");
_curses_panelstate *st = (_curses_panelstate *)PyType_GetModuleState(cls);
return PyCursesCheckERR(st, hide_panel(self->pan), "hide");
}

/*[clinic input]
_curses_panel.panel.show

cls: defining_class

Display the panel (which might have been hidden).
[clinic start generated code]*/

static PyObject *
_curses_panel_panel_show_impl(PyCursesPanelObject *self)
/*[clinic end generated code: output=6b4553ab45c97769 in 8000 put=57b167bbefaa3755]*/
_curses_panel_panel_show_impl(PyCursesPanelObject *self, PyTypeObject *cls)
/*[clinic end generated code: output=dc3421de375f0409 input=8122e80151cb4379]*/
{
return PyCursesCheckERR(show_panel(self->pan), "show");
_curses_panelstate *st = (_curses_panelstate *)PyType_GetModuleState(cls);
return PyCursesCheckERR(st, show_panel(self->pan), "show");
}

/*[clinic input]
_curses_panel.panel.top

cls: defining_class

Push panel to the top of the stack.
[clinic start generated code]*/

static PyObject *
_curses_panel_panel_top_impl(PyCursesPanelObject *self)
/*[clinic end generated code: output=0f5f2f8cdd2d1777 input=be33975ec3ca0e9a]*/
_curses_panel_panel_top_impl(PyCursesPanelObject *self, PyTypeObject *cls)
/*[clinic end generated code: output=10a072e511e873f7 input=1f372d597dda3379]*/
{
return PyCursesCheckERR(top_panel(self->pan), "top");
_curses_panelstate *st = (_curses_panelstate *)PyType_GetModuleState(cls);
return PyCursesCheckERR(st, top_panel(self->pan), "top");
}

/* Allocation and deallocation of Panel Objects */

static PyObject *
PyCursesPanel_New(PANEL *pan, PyCursesWindowObject *wo)
PyCursesPanel_New(PyObject *module, PANEL *pan, PyCursesWindowObject *wo)
{
PyCursesPanelObject *po;
_curses_panelstate *st = get_curses_panelstate(module);

PyCursesPanelObject *po = PyObject_New(PyCursesPanelObject,
(PyTypeObject *)(_curses_panelstate->PyCursesPanel_Type);
if (po == NULL) {
return NULL;
}

po = PyObject_New(PyCursesPanelObject,
(PyTypeObject *)(_curses_panelstate_global)->PyCursesPanel_Type);
if (po == NULL) return NULL;
po->pan = pan;
if (insert_lop(po) < 0) {
po->wo = NULL;
Expand All @@ -267,7 +277,7 @@ PyCursesPanel_Dealloc(PyCursesPanelObject *po)
}
(void)del_panel(po->pan);
if (po->wo != NULL) {
Py_DECREF(po->wo);
Py_DECREF(po->wo);_curses_panelstate
remove_lop(po);
}
PyObject_DEL(po);
Expand Down Expand Up @@ -355,6 +365,7 @@ _curses_panel_panel_hidden_impl(PyCursesPanelObject *self)
/*[clinic input]
_curses_panel.panel.move

cls: defining_class
y: int
x: int
/
Expand All @@ -363,10 +374,12 @@ Move the panel to the screen coordinates (y, x).
[clinic start generated code]*/

static PyObject *
_curses_panel_panel_move_impl(PyCursesPanelObject *self, int y, int x)
/*[clinic end generated code: output=d867535a89777415 input=e0b36b78acc03fba]*/
_curses_panel_panel_move_impl(PyCursesPanelObject *self, PyTypeObject *cls,
int y, int x)
/*[clinic end generated code: output=ce546c93e56867da input=60a0e7912ff99849]*/
{
return PyCursesCheckERR(move_panel(self->pan, y, x), "move_panel");
_curses_panelstate *st = (_curses_panelstate *)PyType_GetModuleState(cls);
return PyCursesCheckERR(st, move_panel(self->pan, y, x), "move_panel");
}

/*[clinic input]
Expand All @@ -386,6 +399,7 @@ _curses_panel_panel_window_impl(PyCursesPanelObject *self)
/*[clinic input]
_curses_panel.panel.replace

cls: defining_class
win: object(type="PyCursesWindowObject *", subclass_of="&PyCursesWindow_Type")
/

Expand All @@ -394,22 +408,22 @@ Change the window associated with the panel to the window win.

static PyObject *
_curses_panel_panel_replace_impl(PyCursesPanelObject *self,
PyTypeObject *cls,
PyCursesWindowObject *win)
/*[clinic end generated code: output=2253a95f7b287255 input=4b1c4283987d9dfa]*/
/*[clinic end generated code: output=c71f95c212d58ae7 input=dbec7180ece41ff5]*/
{
PyCursesPanelObject *po;
int rtn;
_curses_panelstate *st = (_curses_panelstate *)PyType_GetModuleState(cls);

po = find_po(self->pan);
PyCursesPanelObject *po = find_po(self->pan);
if (po == NULL) {
PyErr_SetString(PyExc_RuntimeError,
"replace_panel: can't find Panel Object");
return NULL;
}

rtn = replace_panel(self->pan, win->win);
int rtn = replace_panel(self->pan, win->win);
if (rtn == ERR) {
PyErr_SetString(_curses_panelstate_global->PyCursesError, "replace_panel() returned ERR");
PyErr_SetString(st->PyCursesError, "replace_panel() returned ERR");
return NULL;
}
Py_INCREF(win);
Expand All @@ -420,45 +434,51 @@ _curses_panel_panel_replace_impl(PyCursesPanelObject *self,
/*[clinic input]
_curses_panel.panel.set_userptr

cls: defining_class
obj: object
/

Set the panel's user pointer to obj.
[clinic start generated code]*/

static PyObject *
_curses_panel_panel_set_userptr(PyCursesPanelObject *self, PyObject *obj)
/*[clinic end generated code: output=6fb145b3af88cf4a input=d2c6a9dbefabbf39]*/
_curses_panel_panel_set_userptr_impl(PyCursesPanelObject *self,
PyTypeObject *cls, PyObject *obj)
/*[clinic end generated code: output=db74f3db07b28080 input=e3fee2ff7b1b8e48]*/
{
PyObject *oldobj;
int rc;
PyCursesInitialised;
Py_INCREF(obj);
oldobj = (PyObject *) panel_userptr(self->pan);
rc = set_panel_userptr(self->pan, (void*)obj);
PyObject *oldobj = (PyObject *) panel_userptr(self->pan);
int rc = set_panel_userptr(self->pan, (void*)obj);
if (rc == ERR) {
/* In case of an ncurses error, decref the new object again */
Py_DECREF(obj);
}
Py_XDECREF(oldobj);
return PyCursesCheckERR(rc, "set_panel_userptr");

_curses_panelstate *st = (_curses_panelstate *)PyType_GetModuleState(cls);
return PyCursesCheckERR(st, rc, "set_panel_userptr");
}

/*[clinic input]
_curses_panel.panel.userptr

cls: defining_class

Return the user pointer for the panel.
[clinic start generated code]*/

static PyObject *
_curses_panel_panel_userptr_impl(PyCursesPanelObject *self)
/*[clinic end generated code: output=e849c307b5dc9237 input=f78b7a47aef0fd50]*/
_curses_panel_panel_userptr_impl(PyCursesPanelObject *self,
PyTypeObject *cls)
/*[clinic end generated code: output=eea6e6f39ffc0179 input=f22ca4f115e30a80]*/
{
PyObject *obj;
_curses_panelstate *st = (_curses_panelstate *)PyType_GetModuleState(cls);

PyCursesInitialised;
obj = (PyObject *) panel_userptr(self->pan);
PyObject *obj = (PyObject *) panel_userptr(self->pan);
if (obj == NULL) {
PyErr_SetString(_curses_panelstate_global->PyCursesError, "no userptr set");
PyErr_SetString(st->PyCursesError, "no userptr set");
return NULL;
}

Expand Down Expand Up @@ -539,22 +559,26 @@ _curses_panel_bottom_panel_impl(PyObject *module)
/*[clinic input]
_curses_panel.new_panel

cls: defining_class
win: object(type="PyCursesWindowObject *", subclass_of="&PyCursesWindow_Type")
/

Return a panel object, associating it with the given window win.
[clinic start generated code]*/

static PyObject *
_curses_panel_new_panel_impl(PyObject *module, PyCursesWindowObject *win)
/*[clinic end generated code: output=45e948e0176a9bd2 input=74d4754e0ebe4800]*/
_curses_panel_new_panel_impl(PyObject *module, PyTypeObject *cls,
PyCursesWindowObject *win)
/*[clinic end generated code: output=367de29657788b50 input=5814b695dc719da1]*/
{
_curses_panelstate *st = (_curses_panelstate *)PyType_GetModuleState(cls);

PANEL *pan = new_panel(win->win);
if (pan == NULL) {
PyErr_SetString(_curses_panelstate_global->PyCursesError, catchall_NULL);
PyErr_SetString(st->PyCursesError, catchall_NULL);
return NULL;
}
return (PyObject *)PyCursesPanel_New(pan, win);
return (PyObject *)PyCursesPanel_New(module, pan, win);
}


Expand Down Expand Up @@ -626,12 +650,14 @@ _curses_exec(PyObject *m)
{
_curses_panel_state *st = get_curses_panelstate(m);
/* Initialize object type */
st->PyCursesPanel_Type = PyType_FromSpec(&PyCursesPanel_Type_spec);
if (st->PyCursesPanel_Type == NULL)
st->PyCursesPanel_Type = PyType_FromModuleAndSpec(m, &PyCursesPanel_Type_spec, NULL);
if (st->PyCursesPanel_Type == NULL) {
return -1;
}

if (PyModule_AddType(m, st->PyCursesPanel_Type) < 0)
if (PyModule_AddType(m, st->PyCursesPanel_Type) < 0) {
return -1;
}

import_curses();
if (PyErr_Occurred())
Expand Down
Loading
0