1.1 --- a/imiptools/handlers/person_outgoing.py Mon Oct 16 23:21:15 2017 +0200
1.2 +++ b/imiptools/handlers/person_outgoing.py Tue Oct 17 17:16:36 2017 +0200
1.3 @@ -4,7 +4,7 @@
1.4 Handlers for a person for whom scheduling is performed, inspecting outgoing
1.5 messages to obtain scheduling done externally.
1.6
1.7 -Copyright (C) 2014, 2015, 2016 Paul Boddie <paul@boddie.org.uk>
1.8 +Copyright (C) 2014, 2015, 2016, 2017 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 @@ -21,7 +21,6 @@
1.13 """
1.14
1.15 from imiptools.client import Client
1.16 -from imiptools.data import get_uri, uri_dict, uri_values
1.17 from imiptools.handlers import Handler
1.18 from imiptools.handlers.common import CommonEvent
1.19
1.20 @@ -41,7 +40,7 @@
1.21 if self.obj and not self.user:
1.22 from_organiser = method in self.organiser_methods
1.23 if from_organiser:
1.24 - self.user = get_uri(self.obj.get_value("ORGANIZER"))
1.25 + self.user = self.obj.get_uri("ORGANIZER")
1.26
1.27 # Since there may be many attendees in an attendee-provided outgoing
1.28 # message, because counter-proposals can have more than one
1.29 @@ -179,9 +178,9 @@
1.30
1.31 # Only cancel the event completely if all attendees are given.
1.32
1.33 - attendees = uri_dict(old.get_value_map("ATTENDEE"))
1.34 + attendees = old.get_uri_map("ATTENDEE")
1.35 all_attendees = set(attendees.keys())
1.36 - given_attendees = set(uri_values(self.obj.get_values("ATTENDEE")))
1.37 + given_attendees = set(self.obj.get_uri_values("ATTENDEE"))
1.38 cancel_entire_event = not all_attendees.difference(given_attendees)
1.39
1.40 # Update the recipient's record of the organiser's schedule.
1.41 @@ -238,7 +237,7 @@
1.42 if not self.have_new_object():
1.43 return False
1.44
1.45 - self.remove_counters(uri_values(self.obj.get_values("ATTENDEE")))
1.46 + self.remove_counters(self.obj.get_uri_values("ATTENDEE"))
1.47
1.48 class Event(PersonHandler):
1.49