1.1 --- a/imiptools/handlers/person_outgoing.py Tue Oct 17 14:47:09 2017 +0200
1.2 +++ b/imiptools/handlers/person_outgoing.py Tue Oct 17 17:43:42 2017 +0200
1.3 @@ -21,7 +21,6 @@
1.4 """
1.5
1.6 from imiptools.client import Client
1.7 -from imiptools.data import get_uri, uri_dict, uri_values
1.8 from imiptools.handlers import Handler
1.9 from imiptools.handlers.common import CommonEvent
1.10
1.11 @@ -41,7 +40,7 @@
1.12 if self.obj and not self.user:
1.13 from_organiser = method in self.organiser_methods
1.14 if from_organiser:
1.15 - self.user = get_uri(self.obj.get_value("ORGANIZER"))
1.16 + self.user = self.obj.get_uri("ORGANIZER")
1.17
1.18 # Since there may be many attendees in an attendee-provided outgoing
1.19 # message, because counter-proposals can have more than one
1.20 @@ -183,9 +182,9 @@
1.21
1.22 # Only cancel the event completely if all attendees are given.
1.23
1.24 - attendees = uri_dict(old.get_value_map("ATTENDEE"))
1.25 + attendees = old.get_uri_map("ATTENDEE")
1.26 all_attendees = set(attendees.keys())
1.27 - given_attendees = set(uri_values(self.obj.get_values("ATTENDEE")))
1.28 + given_attendees = set(self.obj.get_uri_values("ATTENDEE"))
1.29 cancel_entire_event = not all_attendees.difference(given_attendees)
1.30
1.31 # Update the recipient's record of the organiser's schedule.
1.32 @@ -242,7 +241,7 @@
1.33 if not self.have_new_object():
1.34 return False
1.35
1.36 - self.remove_counters(uri_values(self.obj.get_values("ATTENDEE")))
1.37 + self.remove_counters(self.obj.get_uri_values("ATTENDEE"))
1.38
1.39 class Event(PersonHandler):
1.40