fixed encoding issues in mailer

Author: cmeerw

roundup/mailer.py

@@ -15,7 +15,7 @@
 from email.mime.multipart import MIMEMultipart
 
 from roundup.anypy import email_
-from roundup.anypy.strings import s2u
+from roundup.anypy.strings import b2s, s2u
 
 try:
     import pyme, pyme.core
@@ -39,7 +39,7 @@ def nice_sender_header(name, address, charset):
     if not name:
         return address
     try:
-        encname = name.encode('ASCII')
+        encname = b2s(name.encode('ASCII'))
     except UnicodeEncodeError:
         # use Header to encode correctly.
         encname = Header(name, charset=charset).encode()

test/test_mailer.py

@@ -10,6 +10,8 @@ def testEncoding(self):
         a('ascii', '[email protected]', 'iso8859-1', 'ascii <[email protected]>')
         a(u'café', '[email protected]', 'iso8859-1',
             '=?iso8859-1?q?caf=E9?= <[email protected]>')
+        a(u'café', '[email protected]', 'utf-8',
+            '=?utf-8?b?Y2Fmw6k=?= <[email protected]>')
         a('as"ii', '[email protected]', 'iso8859-1', '"as\\"ii" <[email protected]>')
 
 # vim: set et sts=4 sw=4 :