1.1 --- a/imipweb/event.py Tue Feb 09 15:57:23 2016 +0100
1.2 +++ b/imipweb/event.py Wed Mar 02 21:17:11 2016 +0100
1.3 @@ -3,7 +3,7 @@
1.4 """
1.5 A Web interface to a calendar event.
1.6
1.7 -Copyright (C) 2014, 2015 Paul Boddie <paul@boddie.org.uk>
1.8 +Copyright (C) 2014, 2015, 2016 Paul Boddie <paul@boddie.org.uk>
1.9
1.10 This program is free software; you can redistribute it and/or modify it under
1.11 the terms of the GNU General Public License as published by the Free Software
1.12 @@ -23,7 +23,6 @@
1.13 uri_parts, uri_values
1.14 from imiptools.dates import format_datetime, to_timezone
1.15 from imiptools.mail import Messenger
1.16 -from imiptools.period import have_conflict
1.17 from imipweb.data import EventPeriod, event_period_from_period, FormPeriod, PeriodError
1.18 from imipweb.resource import DateTimeFormUtilities, FormUtilities, ResourceClientForObject
1.19
1.20 @@ -713,7 +712,7 @@
1.21 partstat = participant_attr and participant_attr.get("PARTSTAT")
1.22 recurrences = self.obj.get_recurrence_start_points(recurrenceids, tzid)
1.23
1.24 - for p in have_conflict(freebusy, periods, True):
1.25 + for p in freebusy.have_conflict(periods, True):
1.26 if not self.recurrenceid and p.is_replaced(recurrences):
1.27 continue
1.28