# HG changeset patch # User Paul Boddie # Date 1423607531 -3600 # Node ID d8832021004ba347ca6714ebcfb115a98b085d8e # Parent f5a63efe8e9973704e1f0f8613a429486a45eaf0 Moved UTC conversion into the free/busy-specific function. diff -r f5a63efe8e99 -r d8832021004b imiptools/data.py --- a/imiptools/data.py Tue Feb 10 23:13:15 2015 +0100 +++ b/imiptools/data.py Tue Feb 10 23:32:11 2015 +0100 @@ -303,7 +303,7 @@ rrule = obj.get_value("RRULE") if not rrule: - return [(obj.get_utc_datetime("DTSTART"), obj.get_utc_datetime("DTEND"))] + return [(obj.get_datetime("DTSTART"), obj.get_datetime("DTEND"))] # Use localised datetimes. @@ -329,7 +329,6 @@ for start in selector.materialise(dtstart, window_end, parameters.get("COUNT"), parameters.get("BYSETPOS")): start = to_timezone(datetime(*start), tzid) - start = to_timezone(start, "UTC") end = start + duration periods.append((start, end)) @@ -351,6 +350,7 @@ for start, end in periods: start, end = get_freebusy_period(start, end, tzid) + start, end = [to_timezone(x, "UTC") for x in start, end] l.append((format_datetime(start), format_datetime(end))) return l