Changeset 112 for trunk

Timestamp:

11/07/08 14:49:39 (2 months ago)

Author:

amcgregor

Message:

Support for internationalized domains (#69) and expanded validation for multiple-level TLDs (e.g. .com.au). Needs additional test cases, and breaks none of the existing ones.

Location:

trunk

Files:

• tests/test_address_list.py (modified) (3 diffs)
• turbomail/util.py (modified) (3 diffs)

trunk/tests/test_address_list.py

@@ -6 +6 @@
 
 import unittest
-from turbomail.util import AddressList
+from turbomail.util import Address, AddressList
 try:
     from email.mime.text import MIMEText
@@ -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-qta.test>", str(addr))
 
 
@@ -61 +67 @@
         self.assertEqual(str(self.addresses[-1]), "eviluser@example.com")
         
+        # Double-at symbols automatically strip from the second at on.
+        self.addresses.append("bad@user@example.com")
+        self.assertEqual(str(self.addresses[-1]), "bad@user")
+        
         self.assertRaises(ValueError, lambda: self.addresses.append("baduser.example.com"))
-        self.assertRaises(ValueError, lambda: self.addresses.append("bad@user@example.com"))
         self.assertRaises(ValueError, lambda: self.addresses.append("bad-u+s+er@example.com"))
-        self.assertRaises(ValueError, lambda: self.addresses.append("baduser@example"))
+        
+        # Domains without TLDs are now supported.
+        self.addresses.append("user@company")
+        self.assertEqual(str(self.addresses[-1]), "user@company")
         
         del self.addresses

trunk/turbomail/util.py

@@ -7 +7 @@
 import re
 import turbomail
-from turbomail.exceptions import MailNotEnabledError
 from email.Header import Header
 from email.Utils import parseaddr, formataddr
@@ -25 +24 @@
     class as well."""
     
-    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})$')
+    validator = re.compile(r'^(\w([-.\w]*\w)*(\+\w+)?@(\w(\-*\w)+)+(\.\w{2,9})*)$', re.UNICODE)
     
     def __init__(self, *args):
@@ -62 +61 @@
         if isinstance(name_string, unicode):
             name_string = str(Header(name_string, encoding))
-        return formataddr((name_string, self.address)).replace("\n", "")
+        
+        # Encode punycode for internationalized domains.
+        localpart, domain = self.address.split("@")
+        if isinstance(domain, unicode):
+            domain = domain.encode("idna")
+        address = "@".join((localpart, domain))
+        
+        return formataddr((name_string, address)).replace("\n", "")