Fix decode header

qreu/email.py

@@ -235,12 +235,13 @@ def header(self, header, default=None):
         if header_value:
             for part in decode_header(header_value):
                 if part[1]:
-                    result.append(part[0].decode(part[1]))
+                    encoded = part[0].decode(part[1])
                 elif isinstance(part[0], bytes):
-                    result.append(part[0].decode('utf-8'))
+                    encoded = part[0].decode('utf-8')
                 else:
-                    result.append(part[0])
-            header_value = ''.join(result)
+                    encoded = part[0]
+                result.append(encoded.strip())
+            header_value = ' '.join(result)
 
         return header_value
 
@@ -301,12 +302,13 @@ def add_header(self, header, value):
             result = []
             for part in decode_header(header_value):
                 if part[1]:
-                    result.append(part[0].decode(part[1]))
+                    encoded = part[0].decode(part[1])
                 elif isinstance(part[0], bytes):
-                    result.append(part[0].decode('utf-8'))
+                    encoded = part[0].decode('utf-8')
                 else:
-                    result.append(part[0])
-            header_value = ''.join(result)
+                    encoded = part[0]
+                result.append(encoded.strip())
+            header_value = ' '.join(result)
             self.bccs = header_value
         else:
             self.email[header] = header_value

spec/address_spec.py

@@ -1,5 +1,5 @@
+# coding=utf-8
 from qreu.address import parse, parse_list, AddressList, Address
-
 from expects import *
 
 

spec/fixtures/5.txt

@@ -0,0 +1 @@
+From: =?utf-8?Q?M=C3=B3nica=20de=20Test=20Example?= <monica@example.com>

spec/qreu_spec.py

@@ -20,7 +20,7 @@
 with description('Parsing an Email'):
     with before.all:
         self.raw_messages = []
-        for fixture in range(0, 5):
+        for fixture in range(0, 6):
             with open('spec/fixtures/{0}.txt'.format(fixture)) as f:
                 self.raw_messages.append(f.read())
 
@@ -109,6 +109,10 @@
         expect(attch).to(contain_exactly('image.png'))
         expect(c.body_parts['files']).to(contain_exactly('image.png'))
 
+    with it('should parse correctly address from weird header'):
+        c = Email.parse(self.raw_messages[5])
+        expect(c.from_).to(have_property('address', 'monica@example.com'))
+
 with description("Creating an Email"):
     with context("empty"):
         with it("must have all attributes to None and work"):
@@ -390,7 +394,7 @@ def call_wrongly():
 
         with it('must add addresses correctly as "name" <address>'):
             address = 'spécial <special@example.com>'
-            parsed = 'spécial<special@example.com>'
+            parsed  = 'spécial <special@example.com>'
             e = Email(to=address)
             expect(e.to).to(equal([parsed]))
             e = Email(cc=address)

spec/sendcontext_spec.py

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# coding=utf-8
 from __future__ import absolute_import, unicode_literals
 from mamba import *
 from expects import *