GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — gh-115398: Revert `PyExpat_CAPI_MAGIC` version bump by hartwork · Pull Request #116411 · python/cpython

Conversation

@hartwork

@hartwork hartwork commented Mar 6, 2024 •
edited by bedevere-app Bot
Loading

Uh oh!

There was an error while loading. Please reload this page.

Copy link
Copy Markdown
Contributor

This reverts part of commit eda2963 from #116301 because it is both hurting and unnecessary, #115623 (comment) explains in detail why.

CC @encukou @gpshead @serhiy-storchaka (alphabetical order)

PS: Could someone add label skip-news for me please, I lack permissions to. Thanks! 🙏

  • Issue: Please expose Expat >=2.6.0 API function XML_SetReparseDeferralEnabled #115398

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions
@hartwork
Revert "pythongh-115398: Increment PyExpat_CAPI_MAGIC for SetReparseD…
f4eca41
…eferralEnabled addition (pythonGH-116301)"

This reverts part of commit eda2963.
@bedevere-app bedevere-app Bot added the awaiting review label Mar 6, 2024
@hartwork hartwork mentioned this pull request Mar 6, 2024
gh-115398: Increment PyExpat_CAPI_MAGIC for SetReparseDeferralEnabled addition #116301
Merged
@AlexWaygood AlexWaygood changed the title Revert PyExpat_CAPI_MAGIC version bump gh-115398: Revert PyExpat_CAPI_MAGIC version bump Mar 6, 2024
@bedevere-app bedevere-app Bot mentioned this pull request Mar 6, 2024
Please expose Expat >=2.6.0 API function XML_SetReparseDeferralEnabled #115398
Closed
@AlexWaygood AlexWaygood added the skip news label Mar 6, 2024
serhiy-storchaka
serhiy-storchaka approved these changes Mar 6, 2024
View reviewed changes
@bedevere-app bedevere-app Bot added awaiting merge and removed awaiting review labels Mar 6, 2024
gpshead
gpshead approved these changes Mar 6, 2024
View reviewed changes
@gpshead
gpshead merged commit 8a8e920 into python:main Mar 6, 2024
@bedevere-app bedevere-app Bot removed the awaiting merge label Mar 6, 2024
adorilson pushed a commit to adorilson/cpython that referenced this pull request Mar 25, 2024
@hartwork @adorilson
pythongh-115398: Revert PyExpat_CAPI_MAGIC version bump (pythonGH-1…
4e6040f
…16411)

Revert "pythongh-115398: Increment PyExpat_CAPI_MAGIC for SetReparseDeferralEnabled addition (pythonGH-116301)"

This reverts part of commit eda2963.  Why? this comment buried in an earlier code review explains:

I checked again how that value is used in practice, it's here:

https://github.com/python/cpython/blob/0c80da4c14d904a367968955544dd6ae58c8101c/Modules/_elementtree.c#L4363-L4372

Based on that code my understanding is that loading bigger structs from the future is considered okay unless `PyExpat_CAPI_MAGIC` differs, which implies that (1) magic needs to stay the same to support loading the future from the past and (2) that `PyExpat_CAPI_MAGIC` should only ever change for changes that do not increase size (but keep it constant).

To summarize, that supports your argument.
I checked branches 3.8, 3.9, 3.10, 3.11, 3.12 now and they all have the same comparison code there so reverting that magic string bump will support seamless backporting.
diegorusso pushed a commit to diegorusso/cpython that referenced this pull request Apr 17, 2024
@hartwork @diegorusso
pythongh-115398: Revert PyExpat_CAPI_MAGIC version bump (pythonGH-1…
6ce8614
…16411)

Revert "pythongh-115398: Increment PyExpat_CAPI_MAGIC for SetReparseDeferralEnabled addition (pythonGH-116301)"

This reverts part of commit eda2963.  Why? this comment buried in an earlier code review explains:

I checked again how that value is used in practice, it's here:

https://github.com/python/cpython/blob/0c80da4c14d904a367968955544dd6ae58c8101c/Modules/_elementtree.c#L4363-L4372

Based on that code my understanding is that loading bigger structs from the future is considered okay unless `PyExpat_CAPI_MAGIC` differs, which implies that (1) magic needs to stay the same to support loading the future from the past and (2) that `PyExpat_CAPI_MAGIC` should only ever change for changes that do not increase size (but keep it constant).

To summarize, that supports your argument.
I checked branches 3.8, 3.9, 3.10, 3.11, 3.12 now and they all have the same comparison code there so reverting that magic string bump will support seamless backporting.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@gpshead gpshead gpshead approved these changes
@serhiy-storchaka serhiy-storchaka serhiy-storchaka approved these changes

Uh oh!

There was an error while loading. Please reload this page.

Assignees

No one assigned

Labels

skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Uh oh!

There was an error while loading. Please reload this page.

4 participants

@hartwork @gpshead @serhiy-storchaka @AlexWaygood
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.