1.1 --- a/imiptools/client.py Tue Feb 09 15:57:23 2016 +0100
1.2 +++ b/imiptools/client.py Wed Mar 02 21:17:11 2016 +0100
1.3 @@ -27,9 +27,6 @@
1.4 from imiptools.dates import check_permitted_values, format_datetime, get_default_timezone, \
1.5 get_duration, get_timestamp
1.6 from imiptools.i18n import get_translator
1.7 -from imiptools.period import can_schedule, remove_event_periods, \
1.8 - remove_additional_periods, remove_affected_period, \
1.9 - update_freebusy
1.10 from imiptools.profile import Preferences
1.11 import imip_store
1.12
1.13 @@ -288,7 +285,7 @@
1.14 offer.
1.15 """
1.16
1.17 - update_freebusy(freebusy, periods, transp, uid, recurrenceid, summary, organiser, expires)
1.18 + freebusy.update_freebusy(periods, transp, uid, recurrenceid, summary, organiser, expires)
1.19
1.20 # Preparation of messages communicating the state of events.
1.21
1.22 @@ -862,7 +859,7 @@
1.23 Indicate whether within 'freebusy' the given 'periods' can be scheduled.
1.24 """
1.25
1.26 - return can_schedule(freebusy, periods, self.uid, self.recurrenceid)
1.27 + return freebusy.can_schedule(periods, self.uid, self.recurrenceid)
1.28
1.29 def have_new_object(self, strict=True):
1.30
1.31 @@ -993,9 +990,9 @@
1.32
1.33 "Remove this event from the given 'freebusy' collection."
1.34
1.35 - removed = remove_event_periods(freebusy, self.uid, self.recurrenceid)
1.36 + removed = freebusy.remove_event_periods(self.uid, self.recurrenceid)
1.37 if not removed and self.recurrenceid:
1.38 - return remove_affected_period(freebusy, self.uid, self.get_recurrence_start_point(self.recurrenceid))
1.39 + return freebusy.remove_affected_period(self.uid, self.get_recurrence_start_point(self.recurrenceid))
1.40 else:
1.41 return removed
1.42
1.43 @@ -1011,18 +1008,18 @@
1.44
1.45 if self.recurrenceid:
1.46 recurrenceid = self.get_recurrence_start_point(self.recurrenceid)
1.47 - remove_affected_period(freebusy, self.uid, recurrenceid)
1.48 + freebusy.remove_affected_period(self.uid, recurrenceid)
1.49 else:
1.50 # Remove obsolete recurrence periods.
1.51
1.52 - remove_additional_periods(freebusy, self.uid, recurrenceids)
1.53 + freebusy.remove_additional_periods(self.uid, recurrenceids)
1.54
1.55 # Remove original periods affected by additional recurrences.
1.56
1.57 if recurrenceids:
1.58 for recurrenceid in recurrenceids:
1.59 recurrenceid = self.get_recurrence_start_point(recurrenceid)
1.60 - remove_affected_period(freebusy, self.uid, recurrenceid)
1.61 + freebusy.remove_affected_period(self.uid, recurrenceid)
1.62
1.63 def update_freebusy(self, freebusy, user, as_organiser, offer=False):
1.64