Skip to content

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

Merged
erlend-aasland merged 8 commits into
python:mainfrom
sobolevn:issue-105375-zoneinfo
Jun 9, 2023
Merged

gh-105375: Improve error handling in zoneinfo module#105586
erlend-aasland merged 8 commits into
python:mainfrom
sobolevn:issue-105375-zoneinfo

Conversation

@sobolevn

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

Copy link
Copy Markdown
Member

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

@bedevere-botbedevere-bot mentioned this pull request Jun 9, 2023
Closed
18 tasks
erlend-aasland
erlend-aasland reviewed Jun 9, 2023
View reviewed changes
Comment threadMisc/NEWS.d/next/Library/2023-06-09-21-11-28.gh-issue-105375.4Mxn7t.rst Outdated
erlend-aasland
erlend-aasland reviewed Jun 9, 2023
View reviewed changes
Comment threadModules/_zoneinfo.c Outdated
erlend-aasland
erlend-aasland previously requested changes Jun 9, 2023
View reviewed changes

@erlend-aaslanderlend-aasland left a comment

Copy link
Copy Markdown
Contributor

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

bedevere-bot commented Jun 9, 2023

Copy link
Copy Markdown

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-aaslanderlend-aasland added needs backport to 3.11 only security fixes needs backport to 3.12 only security fixes labels Jun 9, 2023
sobolevnand others added 3 commits June 9, 2023 22:58
erlend-aasland
erlend-aasland reviewed Jun 9, 2023
View reviewed changes
Comment threadModules/_zoneinfo.c Outdated
erlend-aasland
erlend-aasland reviewed Jun 9, 2023
View reviewed changes
Comment threadModules/_zoneinfo.c Outdated
@erlend-aasland
erlend-aasland self-requested a review June 9, 2023 20:31
@erlend-aasland
erlend-aasland dismissed their stale reviewJune 9, 2023 20:32

Remarks were addressed

sobolevn
sobolevn commented Jun 9, 2023
View reviewed changes

@sobolevnsobolevn left a comment

Copy link
Copy Markdown
MemberAuthor

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

sobolevn commented Jun 9, 2023

Copy link
Copy Markdown
MemberAuthor

Thanks a lot for your patience! 👍

@erlend-aasland

erlend-aasland commented Jun 9, 2023

Copy link
Copy Markdown
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:mainJun 9, 2023
@miss-islington

miss-islington commented Jun 9, 2023

Copy link
Copy Markdown
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 inzoneinfomodule (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

bedevere-bot commented Jun 9, 2023

Copy link
Copy Markdown

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 inzoneinfomodule (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-botbedevere-bot removed the needs backport to 3.12 only security fixes label Jun 9, 2023
@bedevere-bot

bedevere-bot commented Jun 9, 2023

Copy link
Copy Markdown

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

@bedevere-botbedevere-bot removed the needs backport to 3.11 only 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 inzoneinfomodule (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 inzoneinfomodule (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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@erlend-aaslanderlend-aaslanderlend-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.

4 participants

@sobolevn@bedevere-bot@erlend-aasland@miss-islington