Skip to content

bpo-1635741: Port audioop extension module to multiphase initialization(PEP 489) #18608

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 7 commits into from
Mar 11, 2020
Merged

bpo-1635741: Port audioop extension module to multiphase initialization(PEP 489) #18608

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
42b2a61
Port audioop extension module to multiphase initialization(PEP 489)
shihai1991 Feb 22, 2020
981bac9
📜🤖 Added by blurb_it.
blurb-it[bot] Feb 22, 2020
b776cb1
port _audioopstate() macro to inline function
shihai1991 Feb 25, 2020
8434b61
Merge branch 'bpo_1635741_audioop' of https://github.com/shihai1991/c…
shihai1991 Feb 25, 2020
1a1b56e
Update Modules/audioop.c
shihai1991 Mar 1, 2020
cfa67a7
using the var name module to replace m
shihai1991 Mar 1, 2020
5364b74
using the var name module to replace m in get_audioop_state()
shihai1991 Mar 1, 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
Next Next commit
Port audioop extension module to multiphase initialization(PEP 489)
  • Loading branch information
@shihai1991
shihai1991 committed Feb 22, 2020
commit 42b2a610567ec6d33176bcd44fd0c3dc415809ab
38 changes: 27 additions & 11 deletions Modules/audioop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1909,25 +1909,50 @@ audioop_traverse(PyObject *m, visitproc visit, void *arg) {
Py_VISIT(state->AudioopError);
return 0;
}

static int
audioop_clear(PyObject *m) {
_audioopstate *state = _audioopstate(m);
if (state != NULL)
Py_CLEAR(state->AudioopError);
return 0;
}

static void
audioop_free(void *m) {
audioop_clear((PyObject *)m);
}

static int
audioop_exec(PyObject* m)
{
_audioopstate *state = _audioopstate(m);

state->AudioopError = PyErr_NewException("audioop.error", NULL, NULL);
if (state->AudioopError == NULL) {
return -1;
}

Py_INCREF(state->AudioopError);
if (PyModule_AddObject(m, "error", state->AudioopError) < 0) {
Py_DECREF(state->AudioopError);
return -1;
}

return 0;
}

static PyModuleDef_Slot audioop_slots[] = {
{Py_mod_exec, audioop_exec}
Comment thread
shihai1991 marked this conversation as resolved.
Outdated
};

static struct PyModuleDef audioopmodule = {
PyModuleDef_HEAD_INIT,
"audioop",
NULL,
sizeof(_audioopstate),
audioop_methods,
NULL,
audioop_slots,
audioop_traverse,
audioop_clear,
audioop_free
Expand All @@ -1936,14 +1961,5 @@ static struct PyModuleDef audioopmodule = {
PyMODINIT_FUNC
PyInit_audioop(void)
{
PyObject *m = PyModule_Create(&audioopmodule);
if (m == NULL)
return NULL;
PyObject *AudioopError = PyErr_NewException("audioop.error", NULL, NULL);
if (AudioopError == NULL)
return NULL;
Py_INCREF(AudioopError);
PyModule_AddObject(m, "error", AudioopError);
_audioopstate(m)->AudioopError = AudioopError;
return m;
return PyModuleDef_Init(&audioopmodule);
}