FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-159708: Bound recurring zoneinfo rules by the last explicit transition by limadog9 · Pull Request #159833 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

gh-159708: Bound recurring zoneinfo rules by the last explicit transition #159833

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

Open
limadog9 wants to merge 1 commit into
base: main
Choose a base branch
Could not load branches
Branch not found: {{ refName }}

Are you sure you want to change the base?

Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
from
+53 −3
Conversation 0 Commits 1 Checks 55 Files changed 4
Open

gh-159708: Bound recurring zoneinfo rules by the last explicit transition #159833

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

Filter by extension

Filter by extension .c  (1) .py  (2) .rst  (1) All 3 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
33 changes: 33 additions & 0 deletions Lib/test/test_zoneinfo/test_zoneinfo.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -747,6 +747,39 @@ def test_tz_before_only(self):
self.assertEqual(dt.utcoffset(), offset.utcoffset)
self.assertEqual(dt.dst(), offset.dst)

def test_footer_fold_at_last_transition(self):
STD = ZoneOffset("STD", -2 * ONE_H)
transition = ZoneTransition(datetime(2023, 10, 28, 23), STD, STD)
earlier = ZoneTransition(datetime(2020, 1, 1), STD, STD)
cases = [
datetime(2023, 10, 28, 22, 59, 59, 999999),
datetime(2023, 10, 28, 23),
datetime(2023, 10, 28, 23, 0, 0, 1),
datetime(2023, 10, 28, 23, 30),
datetime(2023, 10, 28, 23, 59, 59, 999999),
datetime(2023, 10, 29),
]

# As in America/Nuuk, the footer describes a fold that would start
# before the last explicit transition, while the table has no fold.
for transitions in ([transition], [earlier, transition]):
zf = self.construct_zone(
transitions, after="STD2DST,M3.5.0/-1,M10.5.0/0"
)
zi = self.klass.from_file(zf)
for dt in cases:
for fold in (0, 1):
with self.subTest(
num_transitions=len(transitions), dt=dt, fold=fold
):
local = dt.replace(tzinfo=zi, fold=fold)
self.assertEqual(local.utcoffset(), STD.utcoffset)
self.assertEqual(local.dst(), STD.dst)
self.assertEqual(local.tzname(), STD.tzname)
round_trip = local.astimezone(timezone.utc)
round_trip = round_trip.astimezone(zi)
self.assertEqual(round_trip.replace(tzinfo=None), dt)

def test_empty_zone(self):
zf = self.construct_zone([], "")

Expand Down
10 changes: 9 additions & 1 deletion Lib/zoneinfo/_zoneinfo.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,15 @@ def _find_trans(self, dt):
return self._tti_before
elif not num_trans or ts > lt[-1]:
if isinstance(self._tz_after, _TZStr):
return self._tz_after.get_trans_info(ts, dt.year, dt.fold)
tti = self._tz_after.get_trans_info(ts, dt.year, dt.fold)
# Do not extrapolate recurring rules before the last
# explicit transition.
if (
self._trans_utc
and ts - tti.utcoff.total_seconds() < self._trans_utc[-1]
):
return self._ttinfos[-1]
return tti
else:
return self._tz_after
else:
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2026-10-20-02-02-00.gh-issue-159708.S7h4cV.rst
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix :class:`zoneinfo.ZoneInfo` applying recurring TZ string rules to local
times whose UTC offset is still determined by the explicit transition table.
11 changes: 9 additions & 2 deletions Modules/_zoneinfo.c
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -2244,8 +2244,15 @@ find_ttinfo(zoneinfo_state *state, PyZoneInfo_ZoneInfo *self, PyObject *dt)
return self->ttinfo_before;
}
else if (!num_trans || ts > local_transitions[self->num_transitions - 1]) {
return find_tzrule_ttinfo(&(self->tzrule_after), ts, fold,
PyDateTime_GET_YEAR(dt));
_ttinfo *tti = find_tzrule_ttinfo(&(self->tzrule_after), ts, fold,
PyDateTime_GET_YEAR(dt));
// Do not extrapolate recurring rules before the last explicit
// transition.
if (num_trans && !self->tzrule_after.std_only &&
ts - tti->utcoff_seconds < self->trans_list_utc[num_trans - 1]) {
return self->trans_ttinfos[num_trans - 1];
}
return tti;
}
else {
size_t idx = _bisect(ts, local_transitions, self->num_transitions) - 1;
Expand Down
Loading
Back | FazBrowse Home | New Git URL