From 85ff64d775679345aa826a13ff33f6e986023ea3 Mon Sep 17 00:00:00 2001 From: sobolevn Date: Fri, 4 Jul 2025 21:25:35 +0300 Subject: [PATCH 1/2] gh-136297: Test all `pickle` protocols in `test_zoneinfo_property.py` --- Lib/test/test_zoneinfo/test_zoneinfo_property.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Lib/test/test_zoneinfo/test_zoneinfo_property.py b/Lib/test/test_zoneinfo/test_zoneinfo_property.py index feaa77f3e7f0b9..de369a0a97a677 100644 --- a/Lib/test/test_zoneinfo/test_zoneinfo_property.py +++ b/Lib/test/test_zoneinfo/test_zoneinfo_property.py @@ -146,8 +146,10 @@ def setUp(self): @add_key_examples def test_pickle_unpickle_cache(self, key): zi = self.klass(key) - pkl_str = pickle.dumps(zi) - zi_rt = pickle.loads(pkl_str) + for proto in range(pickle.HIGHEST_PROTOCOL + 1): + with self.subTest(proto=proto): + pkl_str = pickle.dumps(zi, proto) + zi_rt = pickle.loads(pkl_str) self.assertIs(zi, zi_rt) @@ -155,8 +157,10 @@ def test_pickle_unpickle_cache(self, key): @add_key_examples def test_pickle_unpickle_no_cache(self, key): zi = self.klass.no_cache(key) - pkl_str = pickle.dumps(zi) - zi_rt = pickle.loads(pkl_str) + for proto in range(pickle.HIGHEST_PROTOCOL + 1): + with self.subTest(proto=proto): + pkl_str = pickle.dumps(zi, proto) + zi_rt = pickle.loads(pkl_str) self.assertIsNot(zi, zi_rt) self.assertEqual(str(zi), str(zi_rt)) From 8401967367a5581001a0bd5bf7090f422234a713 Mon Sep 17 00:00:00 2001 From: sobolevn Date: Fri, 4 Jul 2025 23:36:00 +0300 Subject: [PATCH 2/2] Fix CI --- Lib/test/test_zoneinfo/test_zoneinfo_property.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_zoneinfo/test_zoneinfo_property.py b/Lib/test/test_zoneinfo/test_zoneinfo_property.py index de369a0a97a677..294c7e9b27a857 100644 --- a/Lib/test/test_zoneinfo/test_zoneinfo_property.py +++ b/Lib/test/test_zoneinfo/test_zoneinfo_property.py @@ -151,7 +151,7 @@ def test_pickle_unpickle_cache(self, key): pkl_str = pickle.dumps(zi, proto) zi_rt = pickle.loads(pkl_str) - self.assertIs(zi, zi_rt) + self.assertIs(zi, zi_rt) @hypothesis.given(key=valid_keys()) @add_key_examples @@ -162,8 +162,8 @@ def test_pickle_unpickle_no_cache(self, key): pkl_str = pickle.dumps(zi, proto) zi_rt = pickle.loads(pkl_str) - self.assertIsNot(zi, zi_rt) - self.assertEqual(str(zi), str(zi_rt)) + self.assertIsNot(zi, zi_rt) + self.assertEqual(str(zi), str(zi_rt)) @hypothesis.given(key=valid_keys()) @add_key_examples