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

Jump to bottom

gh-105375: Improve error handling in zoneinfo module #105586

Merged
merged 8 commits into from Jun 9, 2023
Merged

gh-105375: Improve error handling in zoneinfo module #105586

merged 8 commits into from Jun 9, 2023
+12 −6

Conversation

sobolevn
Copy link
Member

@sobolevn sobolevn commented Jun 9, 2023 •
edited by bedevere-bot

I was only able to find one more case of the problem described in the original issue.

@bedevere-bot bedevere-bot mentioned this pull request Jun 9, 2023
Open
18 tasks
erlend-aasland
erlend-aasland reviewed Jun 9, 2023
View reviewed changes
Modules/_zoneinfo.c Outdated Show resolved Hide resolved
erlend-aasland
erlend-aasland previously requested changes Jun 9, 2023
View reviewed changes
Copy link
Contributor

@erlend-aasland erlend-aasland left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please revert the PyMem_Malloc change; that API does not set an exception so it is out of scope for this issue.

@bedevere-bot
Copy link

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

@erlend-aasland erlend-aasland added needs backport to 3.11 bug and security fixes needs backport to 3.12 bug and security fixes labels Jun 9, 2023
sobolevn and others added 3 commits June 9, 2023 22:58
erlend-aasland
erlend-aasland reviewed Jun 9, 2023
View reviewed changes
Modules/_zoneinfo.c Outdated Show resolved Hide resolved
erlend-aasland
erlend-aasland reviewed Jun 9, 2023
View reviewed changes
Modules/_zoneinfo.c Outdated Show resolved Hide resolved
@erlend-aasland erlend-aasland self-requested a review June 9, 2023 20:31
@erlend-aasland erlend-aasland dismissed their stale review June 9, 2023 20:32

Remarks were addressed

sobolevn
sobolevn commented Jun 9, 2023
View reviewed changes
Copy link
Member Author

@sobolevn sobolevn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow, I need to go to sleep with this many errors in such a tiny PR :)

@sobolevn
Copy link
Member Author

sobolevn commented Jun 9, 2023

Thanks a lot for your patience! 👍

@erlend-aasland
Copy link
Contributor

Thanks a lot for your patience! 👍

Likewise, and thanks for the PR! :)

@erlend-aasland erlend-aasland enabled auto-merge (squash) June 9, 2023 21:13
@erlend-aasland erlend-aasland merged commit 33c92c4 into python:main Jun 9, 2023
21 checks passed
@miss-islington
Copy link
Contributor

Thanks @sobolevn for the PR, and @erlend-aasland for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11, 3.12.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jun 9, 2023
@sobolevn @erlend-aasland @miss-islington
pythongh-105375: Improve error handling in zoneinfo module (pythonG…
7fa1284 
…H-105586)

Fix bugs where exceptions could end up being overwritten
because of deferred error handling.

(cherry picked from commit 33c92c4)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
@bedevere-bot
Copy link

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jun 9, 2023
@sobolevn @erlend-aasland @miss-islington
pythongh-105375: Improve error handling in zoneinfo module (pythonG…
606e8be 
…H-105586)

Fix bugs where exceptions could end up being overwritten
because of deferred error handling.

(cherry picked from commit 33c92c4)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
@bedevere-bot bedevere-bot removed the needs backport to 3.12 bug and security fixes label Jun 9, 2023
@bedevere-bot
Copy link

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

@bedevere-bot bedevere-bot removed the needs backport to 3.11 bug and security fixes label Jun 9, 2023
erlend-aasland added a commit that referenced this pull request Jun 9, 2023
@miss-islington @sobolevn @erlend-aasland
[3.11] gh-105375: Improve error handling in zoneinfo module (GH-105586
4ceb5c4 
) (#105613)

Fix bugs where exceptions could end up being overwritten
because of deferred error handling.

(cherry picked from commit 33c92c4)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
erlend-aasland added a commit that referenced this pull request Jun 9, 2023
@miss-islington @sobolevn @erlend-aasland
[3.12] gh-105375: Improve error handling in zoneinfo module (GH-105586
8c4cf96 
) (#105612)

Fix bugs where exceptions could end up being overwritten
because of deferred error handling.

(cherry picked from commit 33c92c4)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@erlend-aasland erlend-aasland erlend-aasland approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@sobolevn @bedevere-bot @erlend-aasland @miss-islington