1.1 --- a/imiptools/dates.py Tue Feb 03 17:43:44 2015 +0100
1.2 +++ b/imiptools/dates.py Tue Feb 03 18:19:59 2015 +0100
1.3 @@ -111,22 +111,23 @@
1.4
1.5 return None
1.6
1.7 -def get_start_of_day(dt, tzid=None):
1.8 - return datetime(dt.year, dt.month, dt.day, 0, 0, tzinfo=(tzid and timezone(tzid) or dt.tzinfo))
1.9 +def get_start_of_day(dt, tzid):
1.10 + start = datetime(dt.year, dt.month, dt.day, 0, 0)
1.11 + return to_timezone(start, tzid)
1.12
1.13 -def get_end_of_day(dt, tzid=None):
1.14 +def get_end_of_day(dt, tzid):
1.15 return get_start_of_day(dt + timedelta(1), tzid)
1.16
1.17 -def get_start_of_next_day(dt, tzid=None):
1.18 +def get_start_of_next_day(dt, tzid):
1.19 if isinstance(dt, datetime):
1.20 return get_end_of_day(dt, tzid)
1.21 else:
1.22 return dt + timedelta(1)
1.23
1.24 -def ends_on_same_day(dt, end):
1.25 +def ends_on_same_day(dt, end, tzid):
1.26 return (
1.27 dt.date() == end.date() or
1.28 - end == get_end_of_day(dt)
1.29 + end == get_end_of_day(dt, tzid)
1.30 )
1.31
1.32 def get_timestamp():