Skip to content
This repository was archived by the owner on Nov 30, 2023. It is now read-only.

Commit 66320c5

Browse files
committed
Fix for truncating periods with undefined date range. Fixes #413
max(0, None) resulted in start_date being set to 0 (integer). This crashed at a later point when trying to parse the date string 0 (int). Now explicitly handling None when truncating.
1 parent 23e9537 commit 66320c5

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

merge.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1182,8 +1182,10 @@ def TruncatePeriod(service_period, start, end):
11821182
start: The start date as a string in YYYYMMDD format.
11831183
end: The end date as a string in YYYYMMDD format.
11841184
"""
1185-
service_period.start_date = max(service_period.start_date, start)
1186-
service_period.end_date = min(service_period.end_date, end)
1185+
if service_period.start_date is not None:
1186+
service_period.start_date = max(service_period.start_date, start)
1187+
if service_period.end_date is not None:
1188+
service_period.end_date = min(service_period.end_date, end)
11871189
dates_to_delete = []
11881190
for k in service_period.date_exceptions:
11891191
if (k < start) or (k > end):
@@ -1200,7 +1202,7 @@ def TruncatePeriod(service_period, start, end):
12001202
before = (cutoff_date - one_day_delta).strftime('%Y%m%d')
12011203

12021204
for a in self.feed_merger.a_schedule.GetServicePeriodList():
1203-
TruncatePeriod(a, 0, before)
1205+
TruncatePeriod(a, '0'*8, before)
12041206
for b in self.feed_merger.b_schedule.GetServicePeriodList():
12051207
TruncatePeriod(b, cutoff, '9'*8)
12061208

0 commit comments

Comments
 (0)