# HG changeset patch # User Paul Boddie # Date 1445004661 -7200 # Node ID 95b15ca80c25f68deaf3018b483445f3fd54b83f # Parent 034ae540e07a4e4e34276eb77b67dc24996e0d3b Moved sending attendee determination into the common client abstraction. diff -r 034ae540e07a -r 95b15ca80c25 imiptools/client.py --- a/imiptools/client.py Fri Oct 16 00:11:25 2015 +0200 +++ b/imiptools/client.py Fri Oct 16 16:11:01 2015 +0200 @@ -201,6 +201,16 @@ if self.messenger and self.messenger.sender != get_address(self.user): attr["SENT-BY"] = get_uri(self.messenger.sender) + def get_sending_attendee(self): + + "Return the attendee who sent the current object." + + calendar_uri = get_uri(config.MESSAGE_SENDER) + for attendee, attendee_attr in uri_items(self.obj.get_items("ATTENDEE")): + if attendee_attr.get("SENT-BY") == calendar_uri: + return get_uri(attendee) + return None + def get_periods(self, obj): """ diff -r 034ae540e07a -r 95b15ca80c25 imiptools/handlers/person_outgoing.py --- a/imiptools/handlers/person_outgoing.py Fri Oct 16 00:11:25 2015 +0200 +++ b/imiptools/handlers/person_outgoing.py Fri Oct 16 16:11:01 2015 +0200 @@ -21,8 +21,7 @@ """ from imiptools.client import Client -from imiptools.config import MESSAGE_SENDER -from imiptools.data import get_uri, uri_dict, uri_items, uri_values +from imiptools.data import get_uri, uri_dict, uri_values from imiptools.handlers import Handler from imiptools.handlers.common import CommonEvent @@ -50,10 +49,7 @@ # chosen. else: - calendar_uri = get_uri(MESSAGE_SENDER) - for attendee, attendee_attr in uri_items(self.obj.get_items("ATTENDEE")): - if attendee_attr.get("SENT-BY") == calendar_uri: - self.user = get_uri(attendee) + self.user = self.get_sending_attendee() def _add(self):