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

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

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
rename
  • Loading branch information
@koubaa
koubaa committed Sep 7, 2020
commit 4a9bf9304b8d25c16db749cfe6d8ce3604622a94
42 changes: 21 additions & 21 deletions Modules/_curses_panel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@ static const char PyCursesVersion[] = "2.1";
typedef struct {
PyObject *PyCursesError;
PyTypeObject *PyCursesPanel_Type;
} _curses_panelstate;
} _curses_panel_state;

static inline _curses_panelstate *
get_curses_panelstate(PyObject *module)
static inline _curses_panel_state *
get_curses_panel_state(PyObject *module)
{
void *state = PyModule_GetState(module);
assert(state != NULL);
return (_curses_panelstate *)state;
return (_curses_panel_state *)state;
}

static int
_curses_panel_clear(PyObject *mod)
{
_curses_panelstate *state = get_curses_panelstate(mod);
_curses_panel_state *state = get_curses_panel_state(mod);
Py_CLEAR(state->PyCursesError);
Py_CLEAR(state->PyCursesPanel_Type);
return 0;
Expand All @@ -42,7 +42,7 @@ static int
_curses_panel_traverse(PyObject *mod, visitproc visit, void *arg)
{
Py_VISIT(Py_TYPE(mod));
_curses_panelstate *state = get_curses_panelstate(mod);
_curses_panel_state *state = get_curses_panel_state(mod);
Py_VISIT(state->PyCursesError);
Py_VISIT(state->PyCursesPanel_Type);
return 0;
Expand All @@ -62,7 +62,7 @@ _curses_panel_free(void *mod)
*/

static PyObject *
PyCursesCheckERR(_curses_panelstate *state, int code, const char *fname)
PyCursesCheckERR(_curses_panel_state *state, int code, const char *fname)
{
if (code != ERR) {
Py_RETURN_NONE;
Expand Down Expand Up @@ -189,7 +189,7 @@ static PyObject *
_curses_panel_panel_bottom_impl(PyCursesPanelObject *self, PyTypeObject *cls)
/*[clinic end generated code: output=8ec7fbbc08554021 input=6b7d2c0578b5a1c4]*/
{
_curses_panelstate *state = PyType_GetModuleState(cls);
_curses_panel_state *state = PyType_GetModuleState(cls);
return PyCursesCheckERR(state, bottom_panel(self->pan), "bottom");
}

Expand All @@ -207,7 +207,7 @@ static PyObject *
_curses_panel_panel_hide_impl(PyCursesPanelObject *self, PyTypeObject *cls)
/*[clinic end generated code: output=cc6ab7203cdc1450 input=1bfc741f473e6055]*/
{
_curses_panelstate *state = PyType_GetModuleState(cls);
_curses_panel_state *state = PyType_GetModuleState(cls);
return PyCursesCheckERR(state, hide_panel(self->pan), "hide");
}

Expand All @@ -223,7 +223,7 @@ static PyObject *
_curses_panel_panel_show_impl(PyCursesPanelObject *self, PyTypeObject *cls)
/*[clinic end generated code: output=dc3421de375f0409 input=8122e80151cb4379]*/
{
_curses_panelstate *state = PyType_GetModuleState(cls);
_curses_panel_state *state = PyType_GetModuleState(cls);
return PyCursesCheckERR(state, show_panel(self->pan), "show");
}

Expand All @@ -239,14 +239,14 @@ static PyObject *
_curses_panel_panel_top_impl(PyCursesPanelObject *self, PyTypeObject *cls)
/*[clinic end generated code: output=10a072e511e873f7 input=1f372d597dda3379]*/
{
_curses_panelstate *state = PyType_GetModuleState(cls);
_curses_panel_state *state = PyType_GetModuleState(cls);
return PyCursesCheckERR(state, top_panel(self->pan), "top");
}

/* Allocation and deallocation of Panel Objects */

static PyObject *
PyCursesPanel_New(_curses_panelstate *state, PANEL *pan,
PyCursesPanel_New(_curses_panel_state *state, PANEL *pan,
PyCursesWindowObject *wo)
{
PyCursesPanelObject *po = PyObject_New(PyCursesPanelObject,
Expand Down Expand Up @@ -380,7 +380,7 @@ _curses_panel_panel_move_impl(PyCursesPanelObject *self, PyTypeObject *cls,
int y, int x)
/*[clinic end generated code: output=ce546c93e56867da input=60a0e7912ff99849]*/
{
_curses_panelstate *state = PyType_GetModuleState(cls);
_curses_panel_state *state = PyType_GetModuleState(cls);
return PyCursesCheckERR(state, move_panel(self->pan, y, x), "move_panel");
}

Expand Down Expand Up @@ -414,7 +414,7 @@ _curses_panel_panel_replace_impl(PyCursesPanelObject *self,
PyCursesWindowObject *win)
/*[clinic end generated code: output=c71f95c212d58ae7 input=dbec7180ece41ff5]*/
{
_curses_panelstate *state = PyType_GetModuleState(cls);
_curses_panel_state *state = PyType_GetModuleState(cls);

PyCursesPanelObject *po = find_po(self->pan);
if (po == NULL) {
Expand Down Expand Up @@ -458,7 +458,7 @@ _curses_panel_panel_set_userptr_impl(PyCursesPanelObject *self,
}
Py_XDECREF(oldobj);

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

Expand All @@ -475,7 +475,7 @@ _curses_panel_panel_userptr_impl(PyCursesPanelObject *self,
PyTypeObject *cls)
/*[clinic end generated code: output=eea6e6f39ffc0179 input=f22ca4f115e30a80]*/
{
_curses_panelstate *state = PyType_GetModuleState(cls);
_curses_panel_state *state = PyType_GetModuleState(cls);

PyCursesInitialised;
PyObject *obj = (PyObject *) panel_userptr(self->pan);
Expand Down Expand Up @@ -570,7 +570,7 @@ static PyObject *
_curses_panel_new_panel_impl(PyObject *module, PyCursesWindowObject *win)
/*[clinic end generated code: output=45e948e0176a9bd2 input=74d4754e0ebe4800]*/
{
_curses_panelstate *state = get_curses_panelstate(module);
_curses_panel_state *state = get_curses_panel_state(module);

PANEL *pan = new_panel(win->win);
if (pan == NULL) {
Expand Down Expand Up @@ -645,9 +645,9 @@ static PyMethodDef PyCurses_methods[] = {

/* Initialization function for the module */
static int
_curses_exec(PyObject *mod)
_curses_panel_exec(PyObject *mod)
{
_curses_panelstate *state = get_curses_panelstate(mod);
_curses_panel_state *state = get_curses_panel_state(mod);
/* Initialize object type */
state->PyCursesPanel_Type = (PyTypeObject *)PyType_FromModuleAndSpec(
mod, &PyCursesPanel_Type_spec, NULL);
Expand Down Expand Up @@ -696,14 +696,14 @@ _curses_exec(PyObject *mod)
}

static PyModuleDef_Slot _curses_slots[] = {
{Py_mod_exec, _curses_exec},
{Py_mod_exec, _curses_panel_exec},
{0, NULL}
};

static struct PyModuleDef _curses_panelmodule = {
PyModuleDef_HEAD_INIT,
.m_name = "_curses_panel",
.m_size = sizeof(_curses_panelstate),
.m_size = sizeof(_curses_panel_state),
.m_methods = PyCurses_methods,
.m_slots = _curses_slots,
.m_traverse = _curses_panel_traverse,
Expand Down