1.1 --- a/imiptools/client.py Tue Oct 17 14:47:09 2017 +0200
1.2 +++ b/imiptools/client.py Tue Oct 17 17:43:42 2017 +0200
1.3 @@ -28,7 +28,7 @@
1.4 get_window_end, is_new_object, make_freebusy, \
1.5 make_uid, new_object, to_part, \
1.6 update_attendees_with_delegates, \
1.7 - uri_dict, uri_item, uri_items, uri_parts, uri_values
1.8 + uri_dict, 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 @@ -491,7 +491,7 @@
1.13 Return whether the current user is the organiser in the current object.
1.14 """
1.15
1.16 - return get_uri(self.obj.get_value("ORGANIZER")) == self.user
1.17 + return self.obj.get_uri("ORGANIZER") == self.user
1.18
1.19 def is_recurrence(self):
1.20
1.21 @@ -531,7 +531,7 @@
1.22 """
1.23
1.24 obj = obj or self.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_attr(organiser_attr)
1.28
1.29 def update_senders(self, obj=None):
1.30 @@ -545,7 +545,7 @@
1.31 obj = obj or self.obj
1.32 calendar_uri = self.messenger and get_uri(self.messenger.sender)
1.33
1.34 - for attendee, attendee_attr in uri_items(obj.get_items("ATTENDEE") or []):
1.35 + for attendee, attendee_attr in obj.get_uri_items("ATTENDEE") or []:
1.36
1.37 # Fix up the SENT-BY attribute for this user.
1.38
1.39 @@ -571,7 +571,7 @@
1.40 # is taken from the SENT-BY attribute if present, or from the
1.41 # attendee value otherwise.
1.42
1.43 - sent_by = get_sender_identities(uri_dict(self.obj.get_value_map("ATTENDEE")))
1.44 + sent_by = get_sender_identities(self.obj.get_uri_map("ATTENDEE"))
1.45
1.46 # Obtain the attendee for the first sender matching the SENT-BY or
1.47 # attendee value.
1.48 @@ -621,7 +621,7 @@
1.49
1.50 # Get attendee details in a usable form.
1.51
1.52 - stored_attendees = uri_dict(obj.get_value_map("ATTENDEE"))
1.53 + stored_attendees = obj.get_uri_map("ATTENDEE")
1.54
1.55 for attendee, attendee_attr in attendees.items():
1.56
1.57 @@ -649,7 +649,7 @@
1.58 'to_cancel' and 'to_modify' attendee mappings.
1.59 """
1.60
1.61 - attendees = uri_items(self.obj.get_items("ATTENDEE") or [])
1.62 + attendees = self.obj.get_uri_items("ATTENDEE") or []
1.63 attendee_map = OrderedDict(attendees)
1.64
1.65 # Normalise the identities.
1.66 @@ -702,7 +702,7 @@
1.67 given 'partstat'.
1.68 """
1.69
1.70 - attendee_attr = uri_dict(self.obj.get_value_map("ATTENDEE")).get(self.user)
1.71 + attendee_attr = self.obj.get_uri_map("ATTENDEE").get(self.user)
1.72
1.73 if not attendee_attr:
1.74 return None
1.75 @@ -761,8 +761,8 @@
1.76
1.77 obj = obj or self.obj
1.78
1.79 - organiser = get_uri(obj.get_value("ORGANIZER"))
1.80 - attendees = uri_values(obj.get_values("ATTENDEE"))
1.81 + organiser = obj.get_uri("ORGANIZER")
1.82 + attendees = obj.get_uri_values("ATTENDEE")
1.83
1.84 # As organiser, send an invitation to attendees, excluding oneself if
1.85 # also attending. The updated event will be saved by the outgoing
1.86 @@ -1076,7 +1076,7 @@
1.87
1.88 obj = self.get_stored_object_version()
1.89 if obj:
1.90 - stored_organiser = get_uri(obj.get_value("ORGANIZER"))
1.91 + stored_organiser = obj.get_uri("ORGANIZER")
1.92 return stored_organiser == organiser
1.93 else:
1.94 return True
1.95 @@ -1091,7 +1091,7 @@
1.96
1.97 obj = self.get_stored_object_version()
1.98 if obj:
1.99 - stored_attendees = uri_dict(obj.get_value_map("ATTENDEE"))
1.100 + stored_attendees = obj.get_uri_map("ATTENDEE")
1.101 return stored_attendees.has_key(attendee)
1.102 else:
1.103 return True
1.104 @@ -1103,7 +1103,7 @@
1.105 'user' is not specified.
1.106 """
1.107
1.108 - attendees = uri_dict((obj or self.obj).get_value_map("ATTENDEE"))
1.109 + attendees = (obj or self.obj).get_uri_map("ATTENDEE")
1.110 return attendees.get(user or self.user)
1.111
1.112 def is_participating(self, user, as_organiser=False, obj=None):
1.113 @@ -1355,7 +1355,7 @@
1.114 Client.update_freebusy(self, freebusy, periods, transp,
1.115 self.uid, self.recurrenceid,
1.116 obj.get_value("SUMMARY"),
1.117 - get_uri(obj.get_value("ORGANIZER")),
1.118 + obj.get_uri("ORGANIZER"),
1.119 expires)
1.120
1.121 def update_freebusy_for_participant(self, freebusy, user, for_organiser=False,
1.122 @@ -1447,7 +1447,7 @@
1.123
1.124 # Filter out unrecognised attendees.
1.125
1.126 - attendees = set(attendees).intersection(uri_values(obj.get_values("ATTENDEE")))
1.127 + attendees = set(attendees).intersection(obj.get_uri_values("ATTENDEE"))
1.128
1.129 for attendee in attendees:
1.130 self.update_freebusy_from_participant(attendee, False)