Ticket #69: idna.patch

tests/test_address_list.py

@@ -5 +5 @@
 
 
 import unittest
-from turbomail.util import AddressList
+from turbomail.util import Address, AddressList
 try:
     from email.mime.text import MIMEText
 except ImportError:
@@ -15 +15 @@
 import logging
 logging.disable(logging.WARNING)
 
+
+class TestAddress(unittest.TestCase):
+    def test_punycode(self):
+        addr = Address("Foo", u"foo@exÀmple.TEST")
+        self.assertEqual("Foo <foo@xn--exmple-cua.test>", str(addr))
 
 class TestAddressList(unittest.TestCase):
     """Test the AddressList helper class."""

turbomail/util.py

@@ -26 +26 @@
     
     validator = re.compile(r'^([0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(\+([0-9a-zA-Z])+)?@([0-9a-zA-Z][-\w]*[0-9a-zA-Z]\.)+[a-zA-Z]{2,9})$')
     
+    def _assert_valid_emailaddress(self, address):
+        mailparts = address.split("@")
+        if len(mailparts) != 2:
+            raise ValueError, 'An e-mail address must contain a single "@" character!'
+        localpart, domain = mailparts
+        if len(localpart) == 0:
+            raise ValueError, 'local part is empty!'
+        if len(domain) == 0:
+            raise ValueError, 'The domain must not be empty!'
+    
+    def _convert_punycode(self, address):
+        localpart, domain = address.split("@")
+        if isinstance(domain, unicode):
+            domain = domain.encode("idna")
+        return "%s@%s" % (localpart, domain)
+    
     def __init__(self, *args):
         assert len(args) < 3 and len(args) > 0, "You must specify an address or a name and address."
-        
         if len(args) == 1 and isinstance(args[0], basestring):
             self.name, self.address = parseaddr(args[0])
             
@@ -38 +53 @@
         else:
             self.name, self.address = args
         
-        if not self.validator.match(self.address):
-            raise ValueError, 'Invalid e-mail address.'
-        
+        self._assert_valid_emailaddress(self.address)
+        self.address = self._convert_punycode(self.address)
         super(Address, self).__init__()
     
     def __cmp__(self, other):