# HG changeset patch # User Paul Boddie # Date 1427501516 -3600 # Node ID f1588da520d0ed9dfe9f8ce39ab7ca81e44f8949 # Parent 00fcdf47658c6d07c44a48fd4b3d93c62ed8f02f Fixed period abstractions. diff -r 00fcdf47658c -r f1588da520d0 imiptools/data.py --- a/imiptools/data.py Sat Mar 28 00:55:12 2015 +0100 +++ b/imiptools/data.py Sat Mar 28 01:11:56 2015 +0100 @@ -164,8 +164,8 @@ # Write the limits of the resource. - rwrite(("DTSTART", {"VALUE" : "DATE-TIME"}, periods[0][0])) - rwrite(("DTEND", {"VALUE" : "DATE-TIME"}, periods[-1][1])) + rwrite(("DTSTART", {"VALUE" : "DATE-TIME"}, periods[0].start)) + rwrite(("DTEND", {"VALUE" : "DATE-TIME"}, periods[-1].end)) for p in periods: if p.transp == "OPAQUE": diff -r 00fcdf47658c -r f1588da520d0 imiptools/handlers/person.py --- a/imiptools/handlers/person.py Sat Mar 28 00:55:12 2015 +0100 +++ b/imiptools/handlers/person.py Sat Mar 28 01:11:56 2015 +0100 @@ -23,7 +23,7 @@ from imiptools.dates import format_datetime from imiptools.handlers import Handler from imiptools.handlers.common import CommonFreebusy -from imiptools.period import replace_overlapping +from imiptools.period import Period, replace_overlapping from imiptools.profile import Preferences class PersonHandler(Handler): @@ -127,7 +127,7 @@ for v in value: try: start, end = v.split("/", 1) - freebusy.append((start, end)) + freebusy.append(Period(start, end)) except ValueError: pass @@ -137,7 +137,7 @@ for sender, sender_attr in senders: stored_freebusy = self.store.get_freebusy_for_other(user, sender) - replace_overlapping(stored_freebusy, (dtstart, dtend), freebusy) + replace_overlapping(stored_freebusy, Period(dtstart, dtend), freebusy) self.store.set_freebusy_for_other(user, stored_freebusy, sender) class Event(PersonHandler): diff -r 00fcdf47658c -r f1588da520d0 imiptools/handlers/person_outgoing.py --- a/imiptools/handlers/person_outgoing.py Sat Mar 28 00:55:12 2015 +0100 +++ b/imiptools/handlers/person_outgoing.py Sat Mar 28 01:11:56 2015 +0100 @@ -22,7 +22,6 @@ from imiptools.data import get_window_end, uri_dict, uri_item, uri_values from imiptools.handlers import Handler -from imiptools.period import remove_affected_period class PersonHandler(Handler):