1.1 --- a/imiptools/handlers/__init__.py Mon Oct 16 23:21:15 2017 +0200
1.2 +++ b/imiptools/handlers/__init__.py Tue Oct 17 17:16:36 2017 +0200
1.3 @@ -23,7 +23,7 @@
1.4 from imiptools.client import ClientForObject
1.5 from imiptools.config import settings
1.6 from imiptools.data import check_delegation, get_address, get_uri, \
1.7 - get_sender_identities, uri_dict, uri_item
1.8 + get_sender_identities
1.9 from socket import gethostname
1.10
1.11 MANAGER_PATH = settings["MANAGER_PATH"]
1.12 @@ -177,7 +177,7 @@
1.13 Return whether delegation is occurring by returning any delegator.
1.14 """
1.15
1.16 - attendee_map = uri_dict(self.obj.get_value_map("ATTENDEE"))
1.17 + attendee_map = self.obj.get_uri_map("ATTENDEE")
1.18 attendee_attr = attendee_map.get(self.user)
1.19 return check_delegation(attendee_map, self.user, attendee_attr)
1.20
1.21 @@ -192,7 +192,7 @@
1.22 the actual organiser is returned.
1.23 """
1.24
1.25 - organiser, organiser_attr = organiser_item = uri_item(self.obj.get_item("ORGANIZER"))
1.26 + organiser, organiser_attr = organiser_item = self.obj.get_uri_item("ORGANIZER")
1.27
1.28 if not organiser:
1.29 return None
1.30 @@ -235,7 +235,7 @@
1.31 The attendee identities are normalized.
1.32 """
1.33
1.34 - attendee_map = uri_dict(self.obj.get_value_map("ATTENDEE"))
1.35 + attendee_map = self.obj.get_uri_map("ATTENDEE")
1.36
1.37 # Only provide details for attendees who sent/receive the message.
1.38