# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1446043892 -3600
# Node ID 7b1e274628ced7e696c40d5208709038a7964dfd
# Parent  687a559a418ad88dfed89bdf831963e81aaba8aa
Renamed remove_period to remove_event_periods.

diff -r 687a559a418a -r 7b1e274628ce imiptools/client.py
--- a/imiptools/client.py	Wed Oct 28 15:51:16 2015 +0100
+++ b/imiptools/client.py	Wed Oct 28 15:51:32 2015 +0100
@@ -26,7 +26,7 @@
                            uri_dict, uri_item, uri_items, uri_parts, uri_values
 from imiptools.dates import check_permitted_values, format_datetime, get_default_timezone, \
                             get_duration, get_timestamp
-from imiptools.period import can_schedule, remove_period, \
+from imiptools.period import can_schedule, remove_event_periods, \
                              remove_additional_periods, remove_affected_period, \
                              update_freebusy
 from imiptools.profile import Preferences
@@ -960,7 +960,7 @@
 
         "Remove this event from the given 'freebusy' collection."
 
-        if not remove_period(freebusy, self.uid, self.recurrenceid) and self.recurrenceid:
+        if not remove_event_periods(freebusy, self.uid, self.recurrenceid) and self.recurrenceid:
             remove_affected_period(freebusy, self.uid, self.get_recurrence_start_point(self.recurrenceid))
 
     def remove_freebusy_for_recurrences(self, freebusy, recurrenceids=None):
diff -r 687a559a418a -r 7b1e274628ce imiptools/handlers/scheduling.py
--- a/imiptools/handlers/scheduling.py	Wed Oct 28 15:51:16 2015 +0100
+++ b/imiptools/handlers/scheduling.py	Wed Oct 28 15:51:32 2015 +0100
@@ -22,7 +22,8 @@
 from imiptools.data import uri_values
 from imiptools.dates import ValidityError, to_timezone
 from imiptools.period import get_common_periods, invert_freebusy, \
-                             periods_from, remove_period, remove_periods
+                             periods_from, remove_event_periods, \
+                             remove_periods
 
 def schedule_in_freebusy(handler):
 
@@ -105,7 +106,7 @@
 
     # Subtract any periods from this event from the free/busy collections.
 
-    event_periods = remove_period(user_freebusy, handler.uid, handler.recurrenceid)
+    event_periods = remove_event_periods(user_freebusy, handler.uid, handler.recurrenceid)
 
     # Find busy periods for the other attendees.
 
diff -r 687a559a418a -r 7b1e274628ce imiptools/period.py
--- a/imiptools/period.py	Wed Oct 28 15:51:16 2015 +0100
+++ b/imiptools/period.py	Wed Oct 28 15:51:32 2015 +0100
@@ -510,7 +510,7 @@
         if i < len(freebusy) and freebusy[i] == period:
             del freebusy[i]
 
-def remove_period(freebusy, uid, recurrenceid=None):
+def remove_event_periods(freebusy, uid, recurrenceid=None):
 
     """
     Remove from 'freebusy' all periods associated with 'uid' and 'recurrenceid'
@@ -1038,7 +1038,7 @@
     free/busy offer.
     """
 
-    remove_period(freebusy, uid, recurrenceid)
+    remove_event_periods(freebusy, uid, recurrenceid)
 
     for p in periods:
         insert_period(freebusy, FreeBusyPeriod(p.get_start_point(), p.get_end_point(), uid, transp, recurrenceid, summary, organiser, expires))