summaryrefslogtreecommitdiff
path: root/service/pixelated/adapter
diff options
context:
space:
mode:
authorNavaL <mnandri@thoughtworks.com>2016-02-20 19:17:17 +0100
committerNavaL <mnandri@thoughtworks.com>2016-02-20 19:17:17 +0100
commitf92e802df2aeec9b2341ba5b4efea48356edf01f (patch)
tree327c126f1ba7251854006e43380e3eba6122d0d1 /service/pixelated/adapter
parentf1b338e5564a8458c906f903ee7e0383dae86287 (diff)
Revert "Filter keys from attachments #608 w/ @deniscostadsc"
This reverts commit f1b338e5564a8458c906f903ee7e0383dae86287.
Diffstat (limited to 'service/pixelated/adapter')
-rw-r--r--service/pixelated/adapter/mailstore/leap_mailstore.py7
1 files changed, 0 insertions, 7 deletions
diff --git a/service/pixelated/adapter/mailstore/leap_mailstore.py b/service/pixelated/adapter/mailstore/leap_mailstore.py
index 72a16dfa..6cbbe10a 100644
--- a/service/pixelated/adapter/mailstore/leap_mailstore.py
+++ b/service/pixelated/adapter/mailstore/leap_mailstore.py
@@ -29,9 +29,6 @@ from pixelated.support import log_time_deferred
from pixelated.support.functional import to_unicode
-MIME_PGP_KEY = 'application/pgp-keys'
-
-
class AttachmentInfo(object):
def __init__(self, ident, name, encoding=None, ctype='application/octet-stream', size=0):
self.ident = ident
@@ -325,14 +322,10 @@ class LeapMailStore(MailStore):
mbox_uuid = message.get_wrapper().fdoc.mbox_uuid
mbox_name = yield self._mailbox_name_from_uuid(mbox_uuid)
attachments = self._extract_attachment_info_from(message)
- attachments = self._filter_keys(attachments)
mail = LeapMail(mail_id, mbox_name, message.get_wrapper().hdoc.headers, set(message.get_tags()), set(message.get_flags()), body=body, attachments=attachments) # TODO assert flags are passed on
defer.returnValue(mail)
- def _filter_keys(self, attachments):
- return filter(lambda attachment: attachment.ctype != MIME_PGP_KEY, attachments)
-
@defer.inlineCallbacks
def _raw_message_body(self, message):
content_doc = (yield message.get_wrapper().get_body(self.soledad))