summaryrefslogtreecommitdiff
path: root/service/pixelated/adapter/services/mail_service.py
diff options
context:
space:
mode:
authorVictor Shyba <victor.shyba@gmail.com>2015-07-17 22:50:28 +0200
committerFolker Bernitt <fbernitt@thoughtworks.com>2015-08-11 17:00:24 +0200
commitad65388274feaea5f4e0c3df0aafeb800825491e (patch)
tree694400cc3ebd1885694cc22cf3810669dc490982 /service/pixelated/adapter/services/mail_service.py
parent422c434224c965385a21d0d2948b005b6d44cccb (diff)
fixing integration.test_tags
Diffstat (limited to 'service/pixelated/adapter/services/mail_service.py')
-rw-r--r--service/pixelated/adapter/services/mail_service.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/service/pixelated/adapter/services/mail_service.py b/service/pixelated/adapter/services/mail_service.py
index 01f22570..f98020a2 100644
--- a/service/pixelated/adapter/services/mail_service.py
+++ b/service/pixelated/adapter/services/mail_service.py
@@ -38,17 +38,18 @@ class MailService(object):
defer.returnValue((mails, total))
+ @defer.inlineCallbacks
def update_tags(self, mail_id, new_tags):
new_tags = self._filter_white_space_tags(new_tags)
reserved_words = extract_reserved_tags(new_tags)
if len(reserved_words):
raise ValueError('None of the following words can be used as tags: ' + ' '.join(reserved_words))
new_tags = self._favor_existing_tags_casing(new_tags)
- mail = self.mail(mail_id)
- mail.update_tags(set(new_tags))
+ mail = yield self.mail(mail_id)
+ yield mail.update_tags(set(new_tags))
self.search_engine.index_mail(mail)
- return mail
+ defer.returnValue(mail)
def _filter_white_space_tags(self, tags):
return [tag.strip() for tag in tags if not tag.isspace()]