Skip to content
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.

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

[3.10] gh-117187: Fix XML tests for vanilla Expat <2.6.0 (GH-117203) #117246

Merged
merged 1 commit into from
Mar 27, 2024

Conversation

miss-islington
Copy link
Contributor

@miss-islington miss-islington commented Mar 26, 2024

This fixes XML unittest fallout from the #115398 security fix. When configured using --with-system-expat on systems with older pre 2.6.0 versions of libexpat, our unittests were failing.

  • sax|etree: Simplify Expat version guard where simplifiable

Idea by Matěj Cepl

  • sax|etree: Fix reparse deferral tests for vanilla Expat <2.6.0

This does not fix the case of distros with an older version of libexpat with the 2.6.0 feature backported as a security fix. (Ubuntu is a known example of this with its libexpat1 2.5.0-2ubunutu0.1 package)
(cherry picked from commit 9f74e86)

Co-authored-by: Sebastian Pipping [email protected]

)

This fixes XML unittest fallout from the python#115398 security fix.  When configured using `--with-system-expat` on systems with older pre 2.6.0 versions of libexpat, our unittests were failing.

* sax|etree: Simplify Expat version guard where simplifiable

Idea by Matěj Cepl

* sax|etree: Fix reparse deferral tests for vanilla Expat <2.6.0

This *does not fix* the case of distros with an older version of libexpat with the 2.6.0 feature backported as a security fix.  (Ubuntu is a known example of this with its libexpat1 2.5.0-2ubunutu0.1 package)
(cherry picked from commit 9f74e86)

Co-authored-by: Sebastian Pipping <[email protected]>
@bedevere-app bedevere-app bot added the type-bug An unexpected behavior, bug, or error label Mar 26, 2024
@bedevere-app bedevere-app bot added the tests Tests in the Lib/test dir label Mar 26, 2024
@ambv ambv merged commit 0a263cc into python:3.10 Mar 27, 2024
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-blocker tests Tests in the Lib/test dir type-bug An unexpected behavior, bug, or error
Projects
Development

Successfully merging this pull request may close these issues.

4 participants