Skip to content

bpo-1635741: Port _locale extension module to multiphase initialization (PEP 489) #18358

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
+84 −34
Merged

bpo-1635741: Port _locale extension module to multiphase initialization (PEP 489) #18358

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4ce0c7c
Port _locale extension module to multiphase initialization (PEP 489)
shihai1991 Feb 5, 2020
c0e0174
📜🤖 Added by blurb_it.
blurb-it[bot] Feb 5, 2020
3aaf488
add get_locale_state()
shihai1991 Feb 17, 2020
8e0e2bf
Merge branch 'bpo_1635741_9' of https://github.com/shihai1991/cpython…
shihai1991 Feb 17, 2020
2a4ac1b
fix format bug
shihai1991 Feb 18, 2020
70fddf4
locale extension module add clean slots
shihai1991 Feb 18, 2020
f3a1d08
Add back assertion in get_locale_state
encukou Feb 25, 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
locale extension module add clean slots
  • Loading branch information
@shihai1991
shihai1991 committed Feb 18, 2020
commit 70fddf4c8eab7b0418573e270accfa5de25c97eb
34 changes: 30 additions & 4 deletions Modules/_localemodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ static inline _locale_state*
get_locale_state(PyObject *m)
{
void *state = PyModule_GetState(m);
assert(state != NULL);
return (_locale_state *)state;
}

Expand Down Expand Up @@ -750,7 +749,9 @@ _locale_exec(PyObject *m)
if (state->Error == NULL) {
return -1;
}
Py_INCREF(get_locale_state(m)->Error);
if (PyModule_AddObject(m, "Error", get_locale_state(m)->Error) < 0) {
Py_DECREF(get_locale_state(m)->Error);
return -1;
}

Expand All @@ -772,16 +773,41 @@ static struct PyModuleDef_Slot _locale_slots[] = {
{0, NULL}
};

static int
locale_traverse(PyObject *m, visitproc visit, void *arg)
{
_locale_state *state = get_locale_state(m);
if (state == NULL) {
return -1;
}
Py_VISIT(state->Error);
return 0;
}

static int
locale_clear(PyObject *m)
{
_locale_state *state = get_locale_state(m);
Py_CLEAR(state->Error);
return 0;
}

static void
locale_free(PyObject *m)
{
locale_clear(m);
}

static struct PyModuleDef _localemodule = {
PyModuleDef_HEAD_INIT,
"_locale",
locale__doc__,
sizeof(_locale_state),
PyLocale_Methods,
_locale_slots,
NULL,
NULL,
NULL
locale_traverse,
locale_clear,
(freefunc)locale_free
};

PyMODINIT_FUNC
Expand Down