gh-142781: Fix type confusion in zoneinfo weak cache by superboy-zjc · Pull Request #142925 · python/cpython

superboy-zjc · 2025-12-18T09:22:48Z

Validate the types returned from _weak_cache.get() and _weak_cache.setdefault() to prevent type confusion when a ZoneInfo subclass provides a misbehaving cache implementation.

Fixes gh-142781.

Validate the types returned from _weak_cache.get() and _weak_cache.setdefault() to prevent type confusion when a ZoneInfo subclass provides a misbehaving cache implementation.

python-cla-bot · 2025-12-18T09:22:53Z

All commit authors signed the Contributor License Agreement.

Modules/_zoneinfo.c

Misc/NEWS.d/next/Library/2025-12-18-00-14-16.gh-issue-142781.gcOeYF.rst

Lib/test/test_zoneinfo/test_zoneinfo.py

bedevere-app · 2025-12-27T17:52:25Z

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.

…sage, rewriting NEWS and improving unit test

superboy-zjc · 2025-12-29T06:27:47Z

Thanks for the review! I have addressed all the comments above. Ready for another look.

picnixz

You should update the branch as we ZoneInfo was modified recently.

Modules/_zoneinfo.c

Lib/test/test_zoneinfo/test_zoneinfo.py

…42781

…l branch

superboy-zjc · 2026-01-03T19:11:27Z

You should update the branch as we ZoneInfo was modified recently.

Thanks for your advice! All comments are resolved. Let me know if anything else is needed!

Modules/_zoneinfo.c

Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com>

changes were addressed

Modules/_zoneinfo.c

serhiy-storchaka

LGTM. 👍

Modules/_zoneinfo.c

StanFromIreland · 2026-03-01T10:34:22Z

Updating branch to fix the CI, it is currently incompatible.

StanFromIreland

LGTM

Lib/test/test_zoneinfo/test_zoneinfo.py

miss-islington-app · 2026-03-02T12:43:13Z

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

miss-islington-app · 2026-03-02T12:43:17Z

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

…142925) (cherry picked from commit b611db4) Co-authored-by: zhong <60600792+superboy-zjc@users.noreply.github.com> Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> Co-authored-by: Stan Ulbrych <89152624+StanFromIreland@users.noreply.github.com>

bedevere-app · 2026-03-02T12:43:27Z

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

bedevere-app · 2026-03-02T12:43:32Z

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

pythongh-142781: Fix type confusion in zoneinfo weak cache

bf06241

Validate the types returned from _weak_cache.get() and _weak_cache.setdefault() to prevent type confusion when a ZoneInfo subclass provides a misbehaving cache implementation.

superboy-zjc requested a review from pganssle as a code owner December 18, 2025 09:22

bedevere-app bot mentioned this pull request Dec 18, 2025

Type confusion in zoneinfo_ZoneInfo_impl via overridden cache setdefault() #142781

Closed

bedevere-app bot added the awaiting review label Dec 18, 2025

picnixz previously requested changes Dec 27, 2025

View reviewed changes

bedevere-app bot added awaiting changes and removed awaiting review labels Dec 27, 2025

superboy-zjc added 2 commits December 28, 2025 22:04

pythongh-142781: address review comments by refactoring TypeError mes…

1c01521

…sage, rewriting NEWS and improving unit test

pythongh-142781: fix NEWS Lint issue

812e54e

superboy-zjc requested a review from picnixz December 29, 2025 06:21

picnixz reviewed Jan 1, 2026

View reviewed changes

Modules/_zoneinfo.c Outdated Show resolved Hide resolved

Lib/test/test_zoneinfo/test_zoneinfo.py Outdated Show resolved Hide resolved

Lib/test/test_zoneinfo/test_zoneinfo.py Outdated Show resolved Hide resolved

Lib/test/test_zoneinfo/test_zoneinfo.py Outdated Show resolved Hide resolved

superboy-zjc added 2 commits January 3, 2026 10:53

Merge branch 'main' of https://github.com/python/cpython into issue-1…

baa1405

…42781

pythongh-142781: cut off unnecessary comments and refactor the logica…

6a34091

…l branch

picnixz reviewed Jan 3, 2026

View reviewed changes

Modules/_zoneinfo.c Outdated Show resolved Hide resolved

Update Modules/_zoneinfo.c

110351a

Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com>

bedevere-app bot added awaiting review and removed awaiting changes labels Jan 3, 2026

picnixz added awaiting core review and removed awaiting review labels Jan 3, 2026

picnixz self-requested a review January 3, 2026 22:03

serhiy-storchaka reviewed Jan 15, 2026

View reviewed changes

Modules/_zoneinfo.c Outdated Show resolved Hide resolved

Modules/_zoneinfo.c Outdated Show resolved Hide resolved

pythongh-142781: refactoring error message and deduplicating checks

5f60436

serhiy-storchaka approved these changes Feb 2, 2026

View reviewed changes

Modules/_zoneinfo.c Outdated Show resolved Hide resolved

bedevere-app bot added awaiting merge and removed awaiting core review labels Feb 2, 2026

Merge branch 'main' into issue-142781

ec01447

StanFromIreland self-requested a review as a code owner March 1, 2026 10:34

StanFromIreland approved these changes Mar 1, 2026

View reviewed changes

Lib/test/test_zoneinfo/test_zoneinfo.py Outdated Show resolved Hide resolved

Lib/test/test_zoneinfo/test_zoneinfo.py Outdated Show resolved Hide resolved

Apply suggestions from code review

ddf1332

encukou merged commit b611db4 into python:main Mar 2, 2026
47 checks passed

bedevere-app bot removed the awaiting merge label Mar 2, 2026

encukou added needs backport to 3.13 bugs and security fixes needs backport to 3.14 bugs and security fixes labels Mar 2, 2026

bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label Mar 2, 2026

bedevere-app bot removed the needs backport to 3.14 bugs and security fixes label Mar 2, 2026

Uh oh!

Conversation

superboy-zjc commented Dec 18, 2025

Uh oh!

python-cla-bot bot commented Dec 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

bedevere-app bot commented Dec 27, 2025

Uh oh!

superboy-zjc commented Dec 29, 2025

Uh oh!

picnixz left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

superboy-zjc commented Jan 3, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

serhiy-storchaka left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

StanFromIreland commented Mar 1, 2026

Uh oh!

StanFromIreland left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

miss-islington-app bot commented Mar 2, 2026

Uh oh!

miss-islington-app bot commented Mar 2, 2026

Uh oh!

bedevere-app bot commented Mar 2, 2026

Uh oh!

bedevere-app bot commented Mar 2, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

python-cla-bot bot commented Dec 18, 2025 •

edited

Loading