8000 [3.14] gh-87298: Add tests for find_in_strong_cache() bug in _zoneinfo (GH-24829) by miss-islington · Pull Request #136181 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content
8000

[3.14] gh-87298: Add tests for find_in_strong_cache() bug in _zoneinfo (GH-24829) #136181

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jul 1, 2025
Merged

[3.14] gh-87298: Add tests for find_in_strong_cache() bug in _zoneinfo (GH-24829) #136181

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions Lib/test/test_zoneinfo/test_zoneinfo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ def tearDownModule():
shutil.rmtree(TEMP_DIR)


class CustomError(Exception):
pass


class TzPathUserMixin:
"""
Adds a setUp() and tearDown() to make TZPATH manipulations thread-safe.
D6BE Expand Down Expand Up @@ -404,6 +408,25 @@ def test_time_fixed_offset(self):
self.assertEqual(t.utcoffset(), offset.utcoffset)
self.assertEqual(t.dst(), offset.dst)

def test_cache_exception(self):
class Incomparable(str):
eq_called = False
def __eq__(self, other):
self.eq_called = True
raise CustomError
__hash__ = str.__hash__

key = "America/Los_Angeles"
tz1 = self.klass(key)
key = Incomparable(key)
try:
tz2 = self.klass(key)
except CustomError:
self.assertTrue(key.eq_called)
else:
self.assertFalse(key.eq_called)
self.assertIs(tz2, tz1)


class CZoneInfoTest(ZoneInfoTest):
module = c_zoneinfo
Expand Down Expand Up @@ -1507,6 +1530,26 @@ def test_clear_cache_two_keys(self):
self.assertIsNot(dub0, dub1)
self.assertIs(tok0, tok1)

def test_clear_cache_refleak(self):
class Stringy(str):
allow_comparisons = True
def __eq__(self, other):
if not self.allow_comparisons:
raise CustomError
return super().__eq__(other)
__hash__ = str.__hash__

key = Stringy("America/Los_Angeles")
self.klass(key)
key.allow_comparisons = False
try:
# Note: This is try/except rather than assertRaises because
# there is no guarantee that the key is even still in the cache,
# or that the key for the cache is the original `key` object.
self.klass.clear_cache(only_keys="America/Los_Angeles")
except CustomError:
pass


class CZoneInfoCacheTest(ZoneInfoCacheTest):
module = c_zoneinfo
Expand Down
Loading
0