10000 bpo-1635741: convert unicode ucd type to heap type by koubaa · Pull Request #22490 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-1635741: convert unicode ucd type to heap type #22490

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
wants to merge 2 commits into from
Closed

bpo-1635741: convert unicode ucd type to heap type #22490

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c4ece6
convert unicode ucd type to heap type
koubaa Oct 2, 2020
d612585
respond to PR comment
koubaa Oct 10, 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
respond to PR comment
  • Loading branch information
@koubaa
koubaa committed Oct 19, 2020
commit d61258544b5860a316fdce5c2473fd32b62c855f
29 changes: 20 additions & 9 deletions Modules/unicodedata.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1436,7 +1436,8 @@ static PyMethodDef unicodedata_functions[] = {
};

static void
ucd_dealloc(PreviousDBVersion *self) {
ucd_dealloc(PreviousDBVersion *self)
{
PyTypeObject *tp = Py_TYPE(self);
PyObject_Del(self);
Py_DECREF(tp);
Expand All @@ -1447,7 +1448,7 @@ static PyType_Slot unicodedata_ucd_type_slots[] = {
{Py_tp_getattro, PyObject_GenericGetAttr},
{Py_tp_methods, unicodedata_functions},
{Py_tp_members, DB_members},
{0,0}
{0, 0}
};

static PyType_Spec unicodedata_ucd_type_spec = {
Expand Down Expand Up @@ -1492,37 +1493,47 @@ PyInit_unicodedata(void)
state->ucd_type = (PyTypeObject *)PyType_FromSpec(
&unicodedata_ucd_type_spec);
if (state->ucd_type == NULL) {
return NULL;
goto error;
}
}

PyModule_AddStringConstant(mod, "unidata_version", UNIDATA_VERSION);
Py_INCREF(state->ucd_type);
PyModule_AddObject(mod, "UCD", (PyObject*)state->ucd_type);

if (PyModule_AddStringConstant(
mod, "unidata_version", UNIDATA_VERSION) < 0) {
goto error;
}

if (PyModule_AddType(mod, state->ucd_type) < 0) {
goto error;
}

/* Previous versions */
PyObject *v;
v = new_previous_version(state, "3.2.0", get_change_3_2_0, normalization_3_2_0);
if (v == NULL) {
return NULL;
goto error;
}

if (PyModule_AddObject(mod, "ucd_3_2_0", v) < 0) {
Py_DECREF(v);
return NULL;
goto error;
}

/* Export C API */
v = PyCapsule_New((void *)&hashAPI, PyUnicodeData_CAPSULE_NAME, NULL);
if (v == NULL) {
return NULL;
goto error;
}
if (PyModule_AddObject(mod, "ucnhash_CAPI", v) < 0) {
Py_DECREF(v);
return NULL;
goto error;
}
return mod;

error:
Py_DECREF(mod);
return NULL;
}

/*
Expand Down
0