Skip to content

gh-141297: add PyExpat_CheckCompatibility for checking Expat C API compatibility #141300

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

gh-141297: add PyExpat_CheckCompatibility for checking Expat C API compatibility #141300

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
734a09d
add `PyExpat_CheckCompatibility`
picnixz Nov 9, 2025
4350c20
use `PyExpat_CheckCompatibility` in `_elementtree.c`
picnixz Nov 9, 2025
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
use PyExpat_CheckCompatibility in _elementtree.c
  • Loading branch information
@picnixz
picnixz committed Nov 9, 2025
commit 4350c20fb725f03c7a2b86e6e726ee5be486e194
30 changes: 9 additions & 21 deletions Modules/_elementtree.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ typedef struct {
PyTypeObject *TreeBuilder_Type;
PyTypeObject *XMLParser_Type;

PyObject *expat_capsule;
struct PyExpat_CAPI *expat_capi;
} elementtreestate;

Expand Down Expand Up @@ -156,7 +155,6 @@ elementtree_clear(PyObject *m)
Py_CLEAR(st->ElementIter_Type);
Py_CLEAR(st->TreeBuilder_Type);
Py_CLEAR(st->XMLParser_Type);
Py_CLEAR(st->expat_capsule);

st->expat_capi = NULL;
return 0;
Expand All @@ -177,7 +175,7 @@ elementtree_traverse(PyObject *m, visitproc visit, void *arg)
Py_VISIT(st->ElementIter_Type);
Py_VISIT(st->TreeBuilder_Type);
Py_VISIT(st->XMLParser_Type);
Py_VISIT(st->expat_capsule);

return 0;
}

Expand Down Expand Up @@ -4430,28 +4428,18 @@ module_exec(PyObject *m)
if (st->deepcopy_obj == NULL) {
goto error;
}

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

/* link against pyexpat */
if (!(st->expat_capsule = PyImport_ImportModuleAttrString("pyexpat", "expat_CAPI")))
goto error;
if (!(st->expat_capi = PyCapsule_GetPointer(st->expat_capsule, PyExpat_CAPSULE_NAME)))
st->expat_capi = PyCapsule_Import(PyExpat_CAPSULE_NAME, 0);
if (st->expat_capi == NULL) {
goto error;
if (st->expat_capi) {
/* check that it's usable */
if (strcmp(st->expat_capi->magic, PyExpat_CAPI_MAGIC) != 0 ||
(size_t)st->expat_capi->size < sizeof(struct PyExpat_CAPI) ||
st->expat_capi->MAJOR_VERSION != XML_MAJOR_VERSION ||
st->expat_capi->MINOR_VERSION != XML_MINOR_VERSION ||
st->expat_capi->MICRO_VERSION != XML_MICRO_VERSION) {
PyErr_SetString(PyExc_ImportError,
"pyexpat version is incompatible");
goto error;
}
} else {
}
if (!PyExpat_CheckCompatibility(st->expat_capi)) {
PyErr_SetString(PyExc_ImportError, "pyexpat version is incompatible");
goto error;
}

Expand Down
Loading