From af98534d2fa813465665fa67add271e41f229849 Mon Sep 17 00:00:00 2001 From: Duda Dornelles Date: Mon, 22 Dec 2014 10:35:28 -0200 Subject: Sometimes soledad adds a None recipient on a mail header, just making sure that that doesnt break the soledad sync --- service/pixelated/adapter/model/mail.py | 3 ++- service/pixelated/support/functional.py | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'service/pixelated') diff --git a/service/pixelated/adapter/model/mail.py b/service/pixelated/adapter/model/mail.py index 0beb2111..690137ff 100644 --- a/service/pixelated/adapter/model/mail.py +++ b/service/pixelated/adapter/model/mail.py @@ -26,6 +26,7 @@ from email.MIMEMultipart import MIMEMultipart from pycryptopp.hash import sha256 import re import base64 +from pixelated.support.functional import compact class Mail(object): @@ -230,7 +231,7 @@ class PixelatedMail(Mail): if not header_value: continue _headers[header] = header_value if type(header_value) is list else header_value.split(',') - _headers[header] = map(lambda x: x.strip(), _headers[header]) + _headers[header] = map(lambda x: x.strip(), compact(_headers[header])) for header in ['From', 'Subject']: _headers[header] = hdoc_headers.get(header) diff --git a/service/pixelated/support/functional.py b/service/pixelated/support/functional.py index 734eba0b..b496eb95 100644 --- a/service/pixelated/support/functional.py +++ b/service/pixelated/support/functional.py @@ -24,3 +24,7 @@ def unique(_list): seen = set() seen_add = seen.add return [x for x in _list if not (x in seen or seen_add(x))] + + +def compact(_list): + return [a for a in _list if a] -- cgit v1.2.3