Ticket #68: from_umlauts.patch

tests/test_message.py

@@ -58 +58 @@
         subject_string = "Subject: " + str(Header(subject_string, "UTF-8"))
         self.failUnless(subject_string in msg_string)
     
-    
+    def test_from_with_umlaut(self):
+        from_name = u"Karl MÃŒller"
+        from_email = u"karl.mueller@mueller.com"
+        
+        self.message.author = [(from_name, from_email)]
+        self.message.encoding = "ISO-8859-1"
+        
+        msg_string = str(self.message)
+        encoded_name = str(Header(from_name, "ISO-8859-1"))
+        from_string = "From: %s <%s>" % (encoded_name, from_email)
+        self.failUnless(from_string in msg_string)

turbomail/message.py

@@ -218 +218 @@
                 header = list(header)
                 if isinstance(header[1], unicode):
                     header[1] = Header(header[1], self.encoding)
+                elif isinstance(header[1], AddressList):
+                    header[1] = header[1].encode(self.encoding)
                 header[1] = str(header[1])
                 message.add_header(*header)
             elif isinstance(header, dict):

turbomail/util.py

@@ -54 +54 @@
         return "Address(\"%s\")" % str(self)
     
     def __str__(self):
+        return self.encode()
+    
+    def encode(self, encoding="US-ASCII"):
         assert self.address, "You must specify an address."
-        
-        return formataddr((self.name, self.address)).replace("\n", "")
-    
+        name_string = self.name
+        if isinstance(name_string, unicode):
+            name_string = str(Header(name_string, encoding))
+        return formataddr((name_string, self.address)).replace("\n", "")
 
 
 class AddressList(list):
-    def __init__(self, addresses=[]):
+    def __init__(self, addresses=[], encoding=None):
         super(AddressList, self).__init__()
         
+        self.encoding = encoding
         if isinstance(addresses, (basestring, tuple)):
             addresses = [addresses]
         
@@ -75 +80 @@
         return "AddressList(\"" + "\", \"".join([str(i) for i in self]) + "\")"
     
     def __str__(self):
-        return ",\n ".join([str(i) for i in self])
+        return self.encode(self.encoding)
+    
+    def encode(self, encoding="ascii"):
+        addresses = []
+        for address in self:
+            addresses.append(address.encode(encoding))
+        return ",\n ".join(addresses)
     
     def __setitem__(self, k, value):
         if not isinstance(value, Address):