Skip to content

[3.11] gh-158876: Update bundled Expat to 2.9.0 (GH-158881) - #160261

Merged
pablogsal merged 1 commit into
python:3.11from
StanFromIreland:backport-25f598d-3.11
Oct 25, 2026
Merged

pablogsal merged 1 commit into
python:3.11from
StanFromIreland:backport-25f598d-3.11

Conversation

@StanFromIreland

@StanFromIreland StanFromIreland commented Oct 22, 2026 •

Copy link
Copy Markdown
Member

(cherry picked from commit 0071fb5)
(cherry picked from commit 25f598d)

Co-authored-by: Stan Ulbrych <stan@python.org>
Co-authored-by: Petr Viktorin <encukou@gmail.com>
@StanFromIreland
StanFromIreland requested a review from a team as a code owner October 22, 2026 16:14
@pablogsal
pablogsal merged commit b370d7a into python:3.11 Oct 25, 2026
24 checks passed
@StanFromIreland
StanFromIreland deleted the backport-25f598d-3.11 branch October 25, 2026 19:56
icanhasmath pushed a commit to ActiveState/cpython that referenced this pull request Oct 28, 2026
… (python#160261)

(cherry picked from commit 0071fb5)
(cherry picked from commit 25f598d)

Co-authored-by: Petr Viktorin <encukou@gmail.com>
(cherry picked from commit b370d7a)

3.10.22.x: 3.10 builds the bundled expat from setup.py, not from
LIBEXPAT_OBJS in Makefile.pre.in, so xcs.c is added to setup.py's
expat_sources (and xcs.h to expat_depends) instead.
icanhasmath pushed a commit to ActiveState/cpython that referenced this pull request Oct 28, 2026
… (python#160261)

(cherry picked from commit 0071fb5)
(cherry picked from commit 25f598d)

Co-authored-by: Petr Viktorin <encukou@gmail.com>
(cherry picked from commit b370d7a)

3.10.22.x: 3.10 builds the bundled expat from setup.py, not from
LIBEXPAT_OBJS in Makefile.pre.in, so xcs.c is added to setup.py's
expat_sources (and xcs.h to expat_depends) instead.

(cherry picked from commit 95dadd7)

3.9.25.x: 3.9's pyexpat predates the module-state error helpers
(set_xml_error / SET_XML_ERROR), so the 64-bit line/column switch is
applied to 3.9's set_error() directly: it now reads
EXPAT_GetCurrent{Line,Column}Number (XML_GetError{Line,Column}Number
are aliases of the current-position getters in expat), formats them
with %llu, and stores them through a new set_error_attr_location()
that uses PyLong_FromUnsignedLongLong().
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants