1.1 --- a/imiptools/data.py Tue Feb 10 23:13:15 2015 +0100
1.2 +++ b/imiptools/data.py Tue Feb 10 23:32:11 2015 +0100
1.3 @@ -303,7 +303,7 @@
1.4 rrule = obj.get_value("RRULE")
1.5
1.6 if not rrule:
1.7 - return [(obj.get_utc_datetime("DTSTART"), obj.get_utc_datetime("DTEND"))]
1.8 + return [(obj.get_datetime("DTSTART"), obj.get_datetime("DTEND"))]
1.9
1.10 # Use localised datetimes.
1.11
1.12 @@ -329,7 +329,6 @@
1.13
1.14 for start in selector.materialise(dtstart, window_end, parameters.get("COUNT"), parameters.get("BYSETPOS")):
1.15 start = to_timezone(datetime(*start), tzid)
1.16 - start = to_timezone(start, "UTC")
1.17 end = start + duration
1.18 periods.append((start, end))
1.19
1.20 @@ -351,6 +350,7 @@
1.21
1.22 for start, end in periods:
1.23 start, end = get_freebusy_period(start, end, tzid)
1.24 + start, end = [to_timezone(x, "UTC") for x in start, end]
1.25 l.append((format_datetime(start), format_datetime(end)))
1.26
1.27 return l