1.1 --- a/imiptools/client.py Mon Oct 16 23:21:15 2017 +0200
1.2 +++ b/imiptools/client.py Tue Oct 17 17:16:36 2017 +0200
1.3 @@ -25,7 +25,7 @@
1.4 get_sender_identities, get_uri, \
1.5 get_window_end, is_new_object, make_freebusy, \
1.6 make_uid, to_part, update_attendees_with_delegates, \
1.7 - uri_dict, uri_item, uri_items, uri_parts, uri_values
1.8 + uri_parts, uri_values
1.9 from imiptools.dates import check_permitted_values, format_datetime, \
1.10 get_datetime, get_default_timezone, \
1.11 get_duration, get_time, get_timestamp, \
1.12 @@ -364,7 +364,7 @@
1.13 # Get the parent event, add SENT-BY details to the organiser.
1.14
1.15 if not attendee or self.is_participating(attendee, obj=obj):
1.16 - organiser, organiser_attr = uri_item(obj.get_item("ORGANIZER"))
1.17 + organiser, organiser_attr = obj.get_uri_item("ORGANIZER")
1.18 self.update_sender(organiser_attr)
1.19 responses.append(self.object_to_part(method, obj))
1.20 methods.add(method)
1.21 @@ -387,7 +387,7 @@
1.22 obj = self.get_stored_object(self.uid, recurrenceid, section)
1.23
1.24 if not attendee or self.is_participating(attendee, obj=obj):
1.25 - organiser, organiser_attr = uri_item(obj.get_item("ORGANIZER"))
1.26 + organiser, organiser_attr = obj.get_uri_item("ORGANIZER")
1.27 self.update_sender(organiser_attr)
1.28 responses.append(self.object_to_part(rmethod, obj))
1.29 methods.add(rmethod)
1.30 @@ -436,7 +436,7 @@
1.31 Return whether the current user is the organiser in the current object.
1.32 """
1.33
1.34 - return get_uri(self.obj.get_value("ORGANIZER")) == self.user
1.35 + return self.obj.get_uri("ORGANIZER") == self.user
1.36
1.37 def is_recurrence(self):
1.38
1.39 @@ -457,7 +457,7 @@
1.40
1.41 obj = obj or self.obj
1.42 calendar_uri = self.messenger and get_uri(self.messenger.sender)
1.43 - for attendee, attendee_attr in uri_items(obj.get_items("ATTENDEE")):
1.44 + for attendee, attendee_attr in obj.get_uri_items("ATTENDEE"):
1.45 if attendee != self.user:
1.46 if attendee_attr.get("SENT-BY") == calendar_uri:
1.47 del attendee_attr["SENT-BY"]
1.48 @@ -478,7 +478,7 @@
1.49 # is taken from the SENT-BY attribute if present, or from the
1.50 # attendee value otherwise.
1.51
1.52 - sent_by = get_sender_identities(uri_dict(self.obj.get_value_map("ATTENDEE")))
1.53 + sent_by = get_sender_identities(self.obj.get_uri_map("ATTENDEE"))
1.54
1.55 # Obtain the attendee for the first sender matching the SENT-BY or
1.56 # attendee value.
1.57 @@ -547,7 +547,7 @@
1.58
1.59 # Get attendee details in a usable form.
1.60
1.61 - stored_attendees = uri_dict(obj.get_value_map("ATTENDEE"))
1.62 + stored_attendees = obj.get_uri_map("ATTENDEE")
1.63
1.64 for attendee, attendee_attr in attendees.items():
1.65
1.66 @@ -581,7 +581,7 @@
1.67
1.68 to_cancel = []
1.69
1.70 - existing_attendees = uri_items(self.obj.get_items("ATTENDEE") or [])
1.71 + existing_attendees = self.obj.get_uri_items("ATTENDEE") or []
1.72 existing_attendees_map = dict(existing_attendees)
1.73
1.74 # Added attendees are those from the supplied collection not already
1.75 @@ -656,7 +656,7 @@
1.76 given 'partstat'.
1.77 """
1.78
1.79 - attendee_attr = uri_dict(self.obj.get_value_map("ATTENDEE")).get(self.user)
1.80 + attendee_attr = self.obj.get_uri_map("ATTENDEE").get(self.user)
1.81 if not attendee_attr:
1.82 return None
1.83 if partstat:
1.84 @@ -681,8 +681,8 @@
1.85 # also attending. The updated event will be saved by the outgoing
1.86 # handler.
1.87
1.88 - organiser = get_uri(obj.get_value("ORGANIZER"))
1.89 - attendees = uri_values(obj.get_values("ATTENDEE"))
1.90 + organiser = obj.get_uri("ORGANIZER")
1.91 + attendees = obj.get_uri_values("ATTENDEE")
1.92
1.93 if from_organiser:
1.94 recipients = [get_address(attendee) for attendee in attendees if attendee != self.user]
1.95 @@ -795,7 +795,7 @@
1.96
1.97 # Here, the organiser should be the current user.
1.98
1.99 - organiser, organiser_attr = uri_item(self.obj.get_item("ORGANIZER"))
1.100 + organiser, organiser_attr = self.obj.get_uri_item("ORGANIZER")
1.101
1.102 self.update_sender(organiser_attr)
1.103 self.update_senders()
1.104 @@ -855,7 +855,7 @@
1.105
1.106 obj = self.get_stored_object_version()
1.107 if obj:
1.108 - stored_organiser = get_uri(obj.get_value("ORGANIZER"))
1.109 + stored_organiser = obj.get_uri("ORGANIZER")
1.110 return stored_organiser == organiser
1.111 else:
1.112 return True
1.113 @@ -870,7 +870,7 @@
1.114
1.115 obj = self.get_stored_object_version()
1.116 if obj:
1.117 - stored_attendees = uri_dict(obj.get_value_map("ATTENDEE"))
1.118 + stored_attendees = obj.get_uri_map("ATTENDEE")
1.119 return stored_attendees.has_key(attendee)
1.120 else:
1.121 return True
1.122 @@ -882,7 +882,7 @@
1.123 'user' is not specified.
1.124 """
1.125
1.126 - attendees = uri_dict((obj or self.obj).get_value_map("ATTENDEE"))
1.127 + attendees = (obj or self.obj).get_uri_map("ATTENDEE")
1.128 return attendees.get(user or self.user)
1.129
1.130 def is_participating(self, user, as_organiser=False, obj=None):
1.131 @@ -1146,7 +1146,7 @@
1.132 Client.update_freebusy(self, freebusy, periods, transp,
1.133 self.uid, self.recurrenceid,
1.134 obj.get_value("SUMMARY"),
1.135 - get_uri(obj.get_value("ORGANIZER")),
1.136 + obj.get_uri("ORGANIZER"),
1.137 expires)
1.138
1.139 def update_freebusy_for_participant(self, freebusy, user, for_organiser=False,
1.140 @@ -1238,7 +1238,7 @@
1.141
1.142 # Filter out unrecognised attendees.
1.143
1.144 - attendees = set(attendees).intersection(uri_values(obj.get_values("ATTENDEE")))
1.145 + attendees = set(attendees).intersection(obj.get_uri_values("ATTENDEE"))
1.146
1.147 for attendee in attendees:
1.148 self.update_freebusy_from_participant(attendee, False)