diff options
author | Folker Bernitt <fbernitt@thoughtworks.com> | 2015-09-09 18:15:39 +0200 |
---|---|---|
committer | Folker Bernitt <fbernitt@thoughtworks.com> | 2015-09-09 18:15:39 +0200 |
commit | 83ca259ee6e14281dd7087a2187d7a592f6b9e77 (patch) | |
tree | 45a41a231b485787216242f17ecbb1b5d1a2c31f /service/pixelated/adapter/mailstore | |
parent | 7f5c0ec1424ac629c4ab60d72ff9b1a3717fb4c8 (diff) |
Fix mixed encodings in mail subjects
- Issue #450
Diffstat (limited to 'service/pixelated/adapter/mailstore')
-rw-r--r-- | service/pixelated/adapter/mailstore/leap_mailstore.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/service/pixelated/adapter/mailstore/leap_mailstore.py b/service/pixelated/adapter/mailstore/leap_mailstore.py index 6dad12b0..eb12bd1d 100644 --- a/service/pixelated/adapter/mailstore/leap_mailstore.py +++ b/service/pixelated/adapter/mailstore/leap_mailstore.py @@ -114,11 +114,11 @@ class LeapMail(Mail): if isinstance(header_value, list): return self.remove_duplicates([self._decoded_header_utf_8(v) for v in header_value]) elif header_value is not None: - content, encoding = decode_header(header_value)[0] - if encoding: - return unicode(content, encoding=encoding) - else: - return unicode(content, encoding='ascii') + def encode_chunk(content, encoding): + return unicode(content, encoding=encoding or 'ascii') + + encoded_chunks = [encode_chunk(content, encoding) for content, encoding in decode_header(header_value)] + return ' '.join(encoded_chunks) # decode_header strips whitespaces on all chunks, joining over ' ' is only a workaround, not a proper fix def as_dict(self): return { |