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
Next Next commit
update
  • Loading branch information
@koubaa
koubaa committed Sep 7, 2020
commit 1213b3545bebb17e78b8ebaf4322280e768e2d88
62 changes: 41 additions & 21 deletions Modules/_curses_panel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ typedef struct {
PyTypeObject *PyCursesPanel_Type;
} _curses_panelstate;
Comment thread
koubaa marked this conversation as resolved.
Outdated

static inline _curses_panelstate*
static inline _curses_panelstate *
get_curses_panelstate(PyObject *module)
{
void *state = PyModule_GetState(module);
Expand All @@ -30,24 +30,28 @@ get_curses_panelstate(PyObject *module)
}

static int
_curses_panel_clear(PyObject *m)
_curses_panel_clear(PyObject *mod)
{
Py_CLEAR(get_curses_panelstate(m)->PyCursesError);
_curses_panelstate *state = get_curses_panelstate(mod);
Py_CLEAR(state->PyCursesError);
Py_CLEAR(state->PyCursesPanel_Type);
return 0;
}

static int
_curses_panel_traverse(PyObject *m, visitproc visit, void *arg)
_curses_panel_traverse(PyObject *mod, visitproc visit, void *arg)
{
Py_VISIT(Py_TYPE(m));
Py_VISIT(get_curses_panelstate(m)->PyCursesError);
Py_VISIT(Py_TYPE(mod));
_curses_panelstate *state = get_curses_panelstate(mod);
Py_VISIT(state->PyCursesError);
Py_VISIT(state->PyCursesPanel_Type);
return 0;
}

static void
_curses_panel_free(void *m)
_curses_panel_free(void *mod)
{
_curses_panel_clear((PyObject *) m);
_curses_panel_clear((PyObject *) mod);
}

/* Utility Functions */
Expand Down Expand Up @@ -242,10 +246,9 @@ _curses_panel_panel_top_impl(PyCursesPanelObject *self, PyTypeObject *cls)
/* Allocation and deallocation of Panel Objects */

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

PyCursesPanelObject *po = PyObject_New(PyCursesPanelObject,
state->PyCursesPanel_Type);
if (po == NULL) {
Expand Down Expand Up @@ -574,7 +577,7 @@ _curses_panel_new_panel_impl(PyObject *module, PyCursesWindowObject *win)
PyErr_SetString(state->PyCursesError, catchall_NULL);
return NULL;
}
return (PyObject *)PyCursesPanel_New(module, pan, win);
return (PyObject *)PyCursesPanel_New(state, pan, win);
}


Expand Down Expand Up @@ -642,34 +645,51 @@ static PyMethodDef PyCurses_methods[] = {

/* Initialization function for the module */
static int
_curses_exec(PyObject *m)
_curses_exec(PyObject *mod)
Comment thread
koubaa marked this conversation as resolved.
Outdated
{
_curses_panelstate *state = get_curses_panelstate(m);
_curses_panelstate *state = get_curses_panelstate(mod);
/* Initialize object type */
state->PyCursesPanel_Type = (PyTypeObject *)PyType_FromModuleAndSpec(
m, &PyCursesPanel_Type_spec, NULL);
mod, &PyCursesPanel_Type_spec, NULL);
if (state->PyCursesPanel_Type == NULL) {
return -1;
}

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

import_curses();
if (PyErr_Occurred())
if (PyErr_Occurred()) {
return -1;
}

PyObject *d = PyModule_GetDict(m);
/* For exception _curses_panel.error */
state->PyCursesError = PyErr_NewException(
"_curses_panel.error", NULL, NULL);
PyDict_SetItemString(d, "error", state->PyCursesError);

Py_INCREF(state->PyCursesError)
Comment thread
koubaa marked this conversation as resolved.
Outdated
if (PyModule_AddObject(mod, "error", state->PyCursesError) < 0) {
Py_DECREF(state->PyCursesError);
return -1;
}

/* Make the version available */
PyObject *v = PyUnicode_FromString(PyCursesVersion);
Comment thread
koubaa marked this conversation as resolved.
PyDict_SetItemString(d, "version", v);
PyDict_SetItemString(d, "__version__", v);
if (v == null) {
return -1;
}

PyObject *d = PyModule_GetDict(mod);
if (PyDict_SetItemString(d, "version", v) < 0) {
Py_DECREF(v);
return -1;
}
if (PyDict_SetItemString(d, "__version__", v) < 0) {
Py_DECREF(v);
return -1;
}

Py_DECREF(v);

return 0;
Expand Down