Skip to content

bpo-40077: Convert _elementtree types to heap types #23428

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
erlend-aasland wants to merge 14 commits into from
Closed

bpo-40077: Convert _elementtree types to heap types #23428

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
76641a3
Prepare init function
Nov 20, 2020
5cbbe16
Convert element type to heap type
Nov 20, 2020
116fa39
Convert element iter type to heap type
Nov 20, 2020
a792fcf
Convert tree builder type to heap type
Nov 20, 2020
341a92d
Convert xml parser type to heap type
Nov 20, 2020
f35c604
Update clinic
Nov 20, 2020
b6573b1
Add NEWS
Nov 20, 2020
404b398
Use PyModule_AddObjectRef
Nov 20, 2020
6e53e92
Create module before creating types
Nov 20, 2020
525cfaf
Fetch type before GC
Nov 21, 2020
2448e93
Add initialisation guard
Nov 21, 2020
959a225
Address Heime's review: Don't define globals twice
Nov 23, 2020
9210a36
Visit type in type traverse functions
Jan 11, 2021
a6c6fea
Fix NEWS formatting
Jan 11, 2021
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
Prepare init function
  • Loading branch information
Erlend E. Aasland committed Jan 11, 2021
commit 76641a34ace5759fa7f1725451677f19475e5d13
42 changes: 27 additions & 15 deletions Modules/_elementtree.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4382,11 +4382,19 @@ static struct PyModuleDef elementtreemodule = {
elementtree_free
};

#define CREATE_TYPE(module, type, spec) \
do { \
type = (PyTypeObject *)PyType_FromModuleAndSpec(module, spec, NULL); \
if (type == NULL) { \
goto error; \
} \
} while (0)

PyMODINIT_FUNC
PyInit__elementtree(void)
{
PyObject *m, *temp;
elementtreestate *st;
PyObject *m = NULL, *temp;
elementtreestate *st = NULL;

m = PyState_FindModule(&elementtreemodule);
if (m) {
Expand All @@ -4396,31 +4404,31 @@ PyInit__elementtree(void)

/* Initialize object types */
if (PyType_Ready(&ElementIter_Type) < 0)
return NULL;
goto error;
if (PyType_Ready(&TreeBuilder_Type) < 0)
return NULL;
goto error;
if (PyType_Ready(&Element_Type) < 0)
return NULL;
goto error;
if (PyType_Ready(&XMLParser_Type) < 0)
return NULL;
goto error;

m = PyModule_Create(&elementtreemodule);
if (!m)
return NULL;
goto error;
st = get_elementtree_state(m);

if (!(temp = PyImport_ImportModule("copy")))
return NULL;
goto error;
st->deepcopy_obj = PyObject_GetAttrString(temp, "deepcopy");
Py_XDECREF(temp);

if (st->deepcopy_obj == NULL) {
return NULL;
goto error;
}

assert(!PyErr_Occurred());
if (!(st->elementpath_obj = PyImport_ImportModule("xml.etree.ElementPath")))
return NULL;
goto error;

/* link against pyexpat */
expat_capi = PyCapsule_Import(PyExpat_CAPSULE_NAME, 0);
Expand All @@ -4433,19 +4441,18 @@ PyInit__elementtree(void)
expat_capi->MICRO_VERSION != XML_MICRO_VERSION) {
PyErr_SetString(PyExc_ImportError,
"pyexpat version is incompatible");
return NULL;
goto error;
}
} else {
return NULL;
goto error;
}

st->parseerror_obj = PyErr_NewException(
"xml.etree.ElementTree.ParseError", PyExc_SyntaxError, NULL
);
Py_INCREF(st->parseerror_obj);
if (PyModule_AddObject(m, "ParseError", st->parseerror_obj) < 0) {
Py_DECREF(st->parseerror_obj);
return NULL;
goto error;
}

PyTypeObject *types[] = {
Expand All @@ -4456,9 +4463,14 @@ PyInit__elementtree(void)

for (size_t i = 0; i < Py_ARRAY_LENGTH(types); i++) {
if (PyModule_AddType(m, types[i]) < 0) {
return NULL;
goto error;
}
}

return m;

error:
Py_XDECREF(st->parseerror_obj);
Py_XDECREF(m);
return NULL;
}