1.1 --- a/imiptools/handlers/scheduling/quota.py Mon Oct 16 23:21:15 2017 +0200
1.2 +++ b/imiptools/handlers/scheduling/quota.py Tue Oct 17 17:16:36 2017 +0200
1.3 @@ -20,7 +20,6 @@
1.4 """
1.5
1.6 from imiptools.dates import get_duration, to_utc_datetime
1.7 -from imiptools.data import get_uri, uri_dict
1.8 from imiptools.handlers.scheduling.common import get_scheduling_conflicts, \
1.9 standard_responses
1.10 from imiptools.period import Endless
1.11 @@ -109,7 +108,7 @@
1.12
1.13 # Set attendance.
1.14
1.15 - attendee_map = uri_dict(obj.get_value_map("ATTENDEE"))
1.16 + attendee_map = obj.get_uri_map("ATTENDEE")
1.17 attendee_map[handler.user]["PARTSTAT"] = "ACCEPTED"
1.18 obj["ATTENDEE"] = attendee_map.items()
1.19
1.20 @@ -131,7 +130,7 @@
1.21 if not obj:
1.22 return
1.23
1.24 - attendee_map = uri_dict(obj.get_value_map("ATTENDEE"))
1.25 + attendee_map = obj.get_uri_map("ATTENDEE")
1.26 delegates = journal.get_delegates(quota)
1.27
1.28 # Determine whether any of the delegates are still involved.
1.29 @@ -165,7 +164,7 @@
1.30
1.31 # Obtain the identity to whom the quota will apply.
1.32
1.33 - organiser = get_uri(handler.obj.get_value("ORGANIZER"))
1.34 + organiser = handler.obj.get_uri("ORGANIZER")
1.35
1.36 # Obtain any user group to which the quota will apply instead.
1.37
1.38 @@ -320,7 +319,7 @@
1.39
1.40 # Obtain the identity for whom the scheduling will apply.
1.41
1.42 - organiser = get_uri(handler.obj.get_value("ORGANIZER"))
1.43 + organiser = handler.obj.get_uri("ORGANIZER")
1.44
1.45 return quota, organiser
1.46
1.47 @@ -349,7 +348,7 @@
1.48
1.49 # Determine the status of the recipient.
1.50
1.51 - attendee_map = uri_dict(handler.obj.get_value_map("ATTENDEE"))
1.52 + attendee_map = handler.obj.get_uri_map("ATTENDEE")
1.53 attendee_attr = attendee_map[handler.user]
1.54
1.55 # Prevent delegation by a delegate.