1.1 --- a/imiptools/client.py Wed Oct 28 15:51:16 2015 +0100
1.2 +++ b/imiptools/client.py Wed Oct 28 15:51:32 2015 +0100
1.3 @@ -26,7 +26,7 @@
1.4 uri_dict, uri_item, uri_items, uri_parts, uri_values
1.5 from imiptools.dates import check_permitted_values, format_datetime, get_default_timezone, \
1.6 get_duration, get_timestamp
1.7 -from imiptools.period import can_schedule, remove_period, \
1.8 +from imiptools.period import can_schedule, remove_event_periods, \
1.9 remove_additional_periods, remove_affected_period, \
1.10 update_freebusy
1.11 from imiptools.profile import Preferences
1.12 @@ -960,7 +960,7 @@
1.13
1.14 "Remove this event from the given 'freebusy' collection."
1.15
1.16 - if not remove_period(freebusy, self.uid, self.recurrenceid) and self.recurrenceid:
1.17 + if not remove_event_periods(freebusy, self.uid, self.recurrenceid) and self.recurrenceid:
1.18 remove_affected_period(freebusy, self.uid, self.get_recurrence_start_point(self.recurrenceid))
1.19
1.20 def remove_freebusy_for_recurrences(self, freebusy, recurrenceids=None):
2.1 --- a/imiptools/handlers/scheduling.py Wed Oct 28 15:51:16 2015 +0100
2.2 +++ b/imiptools/handlers/scheduling.py Wed Oct 28 15:51:32 2015 +0100
2.3 @@ -22,7 +22,8 @@
2.4 from imiptools.data import uri_values
2.5 from imiptools.dates import ValidityError, to_timezone
2.6 from imiptools.period import get_common_periods, invert_freebusy, \
2.7 - periods_from, remove_period, remove_periods
2.8 + periods_from, remove_event_periods, \
2.9 + remove_periods
2.10
2.11 def schedule_in_freebusy(handler):
2.12
2.13 @@ -105,7 +106,7 @@
2.14
2.15 # Subtract any periods from this event from the free/busy collections.
2.16
2.17 - event_periods = remove_period(user_freebusy, handler.uid, handler.recurrenceid)
2.18 + event_periods = remove_event_periods(user_freebusy, handler.uid, handler.recurrenceid)
2.19
2.20 # Find busy periods for the other attendees.
2.21
3.1 --- a/imiptools/period.py Wed Oct 28 15:51:16 2015 +0100
3.2 +++ b/imiptools/period.py Wed Oct 28 15:51:32 2015 +0100
3.3 @@ -510,7 +510,7 @@
3.4 if i < len(freebusy) and freebusy[i] == period:
3.5 del freebusy[i]
3.6
3.7 -def remove_period(freebusy, uid, recurrenceid=None):
3.8 +def remove_event_periods(freebusy, uid, recurrenceid=None):
3.9
3.10 """
3.11 Remove from 'freebusy' all periods associated with 'uid' and 'recurrenceid'
3.12 @@ -1038,7 +1038,7 @@
3.13 free/busy offer.
3.14 """
3.15
3.16 - remove_period(freebusy, uid, recurrenceid)
3.17 + remove_event_periods(freebusy, uid, recurrenceid)
3.18
3.19 for p in periods:
3.20 insert_period(freebusy, FreeBusyPeriod(p.get_start_point(), p.get_end_point(), uid, transp, recurrenceid, summary, organiser, expires))