1.1 --- a/imip_manager.py Fri Mar 06 23:44:47 2015 +0100
1.2 +++ b/imip_manager.py Fri Mar 06 23:47:20 2015 +0100
1.3 @@ -522,7 +522,10 @@
1.4
1.5 # Merge adjacent dates and datetimes.
1.6
1.7 - if start == last_end or get_start_of_day(last_end, tzid) == get_start_of_day(start, tzid):
1.8 + if start == last_end or \
1.9 + not isinstance(start, datetime) and \
1.10 + get_start_of_day(last_end, tzid) == get_start_of_day(start, tzid):
1.11 +
1.12 last = last_start, end
1.13 continue
1.14
1.15 @@ -530,7 +533,9 @@
1.16 # Datetime periods are within single days and are therefore
1.17 # discarded.
1.18
1.19 - elif get_start_of_day(start, tzid) == get_start_of_day(last_start, tzid):
1.20 + elif not isinstance(last_start, datetime) and \
1.21 + get_start_of_day(start, tzid) == get_start_of_day(last_start, tzid):
1.22 +
1.23 continue
1.24
1.25 # Add separate dates and datetimes.