Skip to content

gh-158876: Update bundled Expat to 2.9.0 - #158881

Merged
encukou merged 6 commits into
python:mainfrom
StanFromIreland:expat-2.9.0
Oct 20, 2026
Merged

gh-158876: Update bundled Expat to 2.9.0#158881
encukou merged 6 commits into
python:mainfrom
StanFromIreland:expat-2.9.0

Conversation

@StanFromIreland

@StanFromIreland StanFromIreland commented Oct 5, 2026 •
edited by bedevere-app Bot
Loading

Copy link
Copy Markdown
Member

@bedevere-app bedevere-app Bot mentioned this pull request Oct 5, 2026
Closed
hartwork
hartwork reviewed Oct 6, 2026
View reviewed changes
Comment thread Modules/expat/pyexpatns.h Resolved
@StanFromIreland
StanFromIreland marked this pull request as ready for review October 6, 2026 18:39
@encukou

encukou commented Oct 20, 2026

Copy link
Copy Markdown
Member

I filed #159893 for the deprecations.

@encukou
encukou enabled auto-merge (squash) October 20, 2026 17:00
@encukou
encukou merged commit 0071fb5 into python:main Oct 20, 2026
62 checks passed
@StanFromIreland
StanFromIreland deleted the expat-2.9.0 branch October 20, 2026 17:42
@StanFromIreland StanFromIreland added needs backport to 3.11 only security fixes needs backport to 3.12 only security fixes needs backport to 3.13 only security fixes needs backport to 3.14 bugs and security fixes labels Oct 20, 2026
@StanFromIreland StanFromIreland added the needs backport to 3.15 bugs and security fixes label Oct 20, 2026
@miss-islington-app

miss-islington-app Bot commented Oct 20, 2026

Copy link
Copy Markdown

Thanks @StanFromIreland for the PR, and @encukou for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖

@miss-islington-app

miss-islington-app Bot commented Oct 20, 2026

Copy link
Copy Markdown

Thanks @StanFromIreland for the PR, and @encukou for merging it 🌮🎉.. I'm working now to backport this PR to: 3.12.
🐍🍒⛏🤖

@miss-islington-app

miss-islington-app Bot commented Oct 20, 2026

Copy link
Copy Markdown

Thanks @StanFromIreland for the PR, and @encukou for merging it 🌮🎉.. I'm working now to backport this PR to: 3.14.
🐍🍒⛏🤖

@miss-islington-app

miss-islington-app Bot commented Oct 20, 2026

Copy link
Copy Markdown

Thanks @StanFromIreland for the PR, and @encukou for merging it 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖

@miss-islington-app

miss-islington-app Bot commented Oct 20, 2026

Copy link
Copy Markdown

Thanks @StanFromIreland for the PR, and @encukou for merging it 🌮🎉.. I'm working now to backport this PR to: 3.15.
🐍🍒⛏🤖

@miss-islington-app

miss-islington-app Bot commented Oct 20, 2026

Copy link
Copy Markdown

Sorry, @StanFromIreland and @encukou, I could not cleanly backport this to 3.11 due to a conflict.

Please backport manually with cherry_picker, see the devguide for more information.

cherry_picker 0071fb511110a03d8766a9061f8813c9a1a9a4de 3.11

@miss-islington-app

miss-islington-app Bot commented Oct 20, 2026

Copy link
Copy Markdown

Sorry, @StanFromIreland and @encukou, I could not cleanly backport this to 3.12 due to a conflict.

Please backport manually with cherry_picker, see the devguide for more information.

cherry_picker 0071fb511110a03d8766a9061f8813c9a1a9a4de 3.12

@miss-islington-app

miss-islington-app Bot commented Oct 20, 2026

Copy link
Copy Markdown

Sorry, @StanFromIreland and @encukou, I could not cleanly backport this to 3.13 due to a conflict.

Please backport manually with cherry_picker, see the devguide for more information.

cherry_picker 0071fb511110a03d8766a9061f8813c9a1a9a4de 3.13

@bedevere-app

bedevere-app Bot commented Oct 20, 2026

Copy link
Copy Markdown

GH-159920 is a backport of this pull request to the 3.14 branch.

@bedevere-app bedevere-app Bot removed the needs backport to 3.14 bugs and security fixes label Oct 20, 2026
@bedevere-app

bedevere-app Bot commented Oct 20, 2026

Copy link
Copy Markdown

GH-159921 is a backport of this pull request to the 3.15 branch.

@bedevere-app bedevere-app Bot removed the needs backport to 3.15 bugs and security fixes label Oct 20, 2026
StanFromIreland added a commit that referenced this pull request Oct 20, 2026
@miss-islington @StanFromIreland @encukou
[3.14] gh-158876: Update bundled Expat to 2.9.0 (GH-158881) (#159920)
db34557 
(cherry picked from commit 0071fb5)

Co-authored-by: Stan Ulbrych <stan@python.org>
Co-authored-by: Petr Viktorin <encukou@gmail.com>
StanFromIreland added a commit that referenced this pull request Oct 20, 2026
@miss-islington @StanFromIreland @encukou
[3.15] gh-158876: Update bundled Expat to 2.9.0 (GH-158881) (#159921)
1f70745 
(cherry picked from commit 0071fb5)

Co-authored-by: Stan Ulbrych <stan@python.org>
Co-authored-by: Petr Viktorin <encukou@gmail.com>
@bedevere-app

bedevere-app Bot commented Oct 22, 2026

Copy link
Copy Markdown

GH-160257 is a backport of this pull request to the 3.13 branch.

@bedevere-app bedevere-app Bot removed the needs backport to 3.13 only security fixes label Oct 22, 2026
@bedevere-app

bedevere-app Bot commented Oct 22, 2026

Copy link
Copy Markdown

GH-160258 is a backport of this pull request to the 3.12 branch.

@bedevere-app bedevere-app Bot removed the needs backport to 3.12 only security fixes label Oct 22, 2026
@bedevere-app

bedevere-app Bot commented Oct 22, 2026

Copy link
Copy Markdown

GH-160261 is a backport of this pull request to the 3.11 branch.

@bedevere-app bedevere-app Bot removed the needs backport to 3.11 only security fixes label Oct 22, 2026
Yhg1s pushed a commit that referenced this pull request Oct 25, 2026
@StanFromIreland @encukou
[3.12] gh-158876: Update bundled Expat to 2.9.0 (GH-158881) (#160258)
5cf3260 
(cherry picked from commit 0071fb5)
(cherry picked from commit 25f598d)

Co-authored-by: Petr Viktorin <encukou@gmail.com>
Yhg1s added a commit that referenced this pull request Oct 25, 2026
@StanFromIreland @encukou @Yhg1s
[3.13] gh-158876: Update bundled Expat to 2.9.0 (GH-158881) (#160257)
cb3a838 
(cherry picked from commit 0071fb5)

Co-authored-by: Petr Viktorin <encukou@gmail.com>
Co-authored-by: T. Wouters <thomas@python.org>
pablogsal pushed a commit that referenced this pull request Oct 25, 2026
@StanFromIreland @encukou
[3.11] gh-158876: Update bundled Expat to 2.9.0 (GH-158881) (#160261)
b370d7a 
(cherry picked from commit 0071fb5)
(cherry picked from commit 25f598d)

Co-authored-by: Petr Viktorin <encukou@gmail.com>
icanhasmath pushed a commit to ActiveState/cpython that referenced this pull request Oct 28, 2026
@StanFromIreland @icanhasmath
[3.11] pythongh-158876: Update bundled Expat to 2.9.0 (pythonGH-158881)…
bcd989e 
… (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
@StanFromIreland @icanhasmath
[3.11] pythongh-158876: Update bundled Expat to 2.9.0 (pythonGH-158881)…
da54fc1 
… (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

Reviewers

@encukou encukou encukou approved these changes
@sethmlarson sethmlarson Awaiting requested review from sethmlarson sethmlarson is a code owner
@erlend-aasland erlend-aasland Awaiting requested review from erlend-aasland erlend-aasland is a code owner
@AA-Turner AA-Turner Awaiting requested review from AA-Turner AA-Turner is a code owner
@emmatyping emmatyping Awaiting requested review from emmatyping emmatyping is a code owner
@itamaro itamaro Awaiting requested review from itamaro itamaro is a code owner
@gpshead gpshead Awaiting requested review from gpshead
+1 more reviewer
@hartwork hartwork hartwork left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@encukou encukou

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@StanFromIreland @encukou @hartwork