Skip to content

bpo-1635741 unicodedata #21375

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

Closed
koubaa wants to merge 4 commits into from
+92 −83
Closed

bpo-1635741 unicodedata #21375

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
954fd68
port unicodedata to multi-phase init
koubaa Jul 7, 2020
0b3b0c0
fix type check
koubaa Jul 7, 2020
751081e
fix issue and blurb
koubaa Jul 7, 2020
1cba0bc
update code
koubaa Jul 8, 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
update code
  • Loading branch information
@koubaa
koubaa committed Jul 8, 2020
commit 1cba0bc10899e04e2a5c12b449d882fb1d8aa91a
24 changes: 18 additions & 6 deletions Modules/unicodedata.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1426,9 +1426,8 @@ UnicodeData File Format " UNIDATA_VERSION ".");
static int unicodedata_exec(PyObject *m)
{
PyObject *v;
UnicodeDataState* st;

st = unicodedata_get_state(m);
UnicodeDataState *st = unicodedata_get_state(m);

st->ucd_type = (PyTypeObject *)PyType_FromModuleAndSpec(m, &unicodedata_ucd_type_spec, NULL);
if (st->ucd_type == NULL) {
Expand All @@ -1445,13 +1444,25 @@ static int unicodedata_exec(PyObject *m)

/* Previous versions */
v = new_previous_version(m, "3.2.0", get_change_3_2_0, normalization_3_2_0);
if (v != NULL)
PyModule_AddObject(m, "ucd_3_2_0", v);
if (v == NULL)
return -1;

if (PyModule_AddObject(m, "ucd_3_2_0", v) < 0) {
Py_DECREF(v);
return -1;
}

/* Export C API */
v = PyCapsule_New((void *)&hashAPI, PyUnicodeData_CAPSULE_NAME, NULL);
if (v != NULL)
PyModule_AddObject(m, "ucnhash_CAPI", v);
if (v == NULL)
return -1;

if (PyModule_AddObject(m, "ucnhash_CAPI", v) < 0)
{
Py_DECREF(v);
return -1;
}

return 0;
}

Expand All @@ -1463,6 +1474,7 @@ static PyModuleDef_Slot unicodedata_slots[] = {
static struct PyModuleDef unicodedata_module = {
PyModuleDef_HEAD_INIT,
.m_name = "unicodedata",
Comment thread
koubaa marked this conversation as resolved.
.m_doc = unicodedata_docstring,
.m_size = sizeof(UnicodeDataState),
.m_methods = unicodedata_functions,
.m_slots = unicodedata_slots,
Expand Down