1.1 --- a/imip_manager.py Mon Mar 02 20:27:59 2015 +0100
1.2 +++ b/imip_manager.py Tue Mar 03 00:03:45 2015 +0100
1.3 @@ -140,8 +140,8 @@
1.4
1.5 """
1.6 Update the attendees in 'obj' with the given 'added' and 'removed'
1.7 - attendee lists. A tuple is returned containing the remaining attendees,
1.8 - together with the attendees whose attendance should be cancelled.
1.9 + attendee lists. A list is returned containing the attendees whose
1.10 + attendance should be cancelled.
1.11 """
1.12
1.13 to_cancel = []
1.14 @@ -166,7 +166,7 @@
1.15
1.16 obj["ATTENDEE"] = attendees
1.17
1.18 - return remaining, to_cancel
1.19 + return to_cancel
1.20
1.21 class ManagerHandler(Common, Handler):
1.22
1.23 @@ -294,7 +294,7 @@
1.24
1.25 # Update the attendees in the event.
1.26
1.27 - remaining, to_cancel = self.update_attendees(self.obj, added, removed)
1.28 + to_cancel = self.update_attendees(self.obj, added, removed)
1.29
1.30 self.update_dtstamp()
1.31 self.set_sequence(update)
1.32 @@ -305,6 +305,7 @@
1.33 # is now cancelled.
1.34
1.35 if to_cancel:
1.36 + remaining = self.obj["ATTENDEE"]
1.37 self.obj["ATTENDEE"] = to_cancel
1.38 self.send_message("CANCEL", get_address(organiser), for_organiser=True)
1.39
1.40 @@ -662,7 +663,7 @@
1.41 # Save single user events.
1.42
1.43 elif save:
1.44 - remaining, to_cancel = self.update_attendees(obj, added, removed)
1.45 + to_cancel = self.update_attendees(obj, added, removed)
1.46 self.store.set_event(self.user, uid, None, node=obj.to_node())
1.47 self.update_freebusy(uid, None, obj=obj)
1.48 self.remove_request(uid)