Changeset 41 for branches/3.0/turbomail/util.py

Timestamp:

10/22/07 01:55:26 (1 year ago)

Author:

amcgregor

Message:

Rewrite of the AddressList? class and its integration into the Message class.

Files:

• branches/3.0/turbomail/util.py (modified) (1 diff)

branches/3.0/turbomail/util.py

@@ -3 +3 @@
 """MIME-encoded electronic mail message classes."""
 
+import re, turbomail
+from turbomail.exceptions import MailNotEnabledError
 from email.Header import Header
-from email.utils import formataddr
+from email.utils import parseaddr, formataddr
 
-__all__ = ['AddressList']
+__all__ = ['Address', 'AddressList', 'protected', 'send']
+
+
+class Address(object):
+        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 __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])
+                        
+                elif not isinstance(args[0], basestring):
+                        self.name, self.address = args[0]
+                        
+                else:
+                        self.name, self.address = args
+                
+                if not self.validator.match(self.address):
+                        raise ValueError, 'Invalid e-mail address.'
+                
+                super(Address, self).__init__()
+        
+        def __cmp__(self, other):
+                if isinstance(other, (Address, basestring)):
+                        return cmp(str(self), str(other))
+                elif isinstance(other, tuple):
+                        return cmp((self.name, self.address), other)
+                return cmp(self, other)
+        
+        def __repr__(self):
+                return "Address(\"%s\")" % str(self)
+        
+        def __str__(self):
+                assert self.address, "You must specify an address."
+                
+                return formataddr((self.name, self.address)).replace("\n", "")
+        
 
 
 class AddressList(list):
-        """docstring for AddressList"""
-        
         def __init__(self, addresses=[]):
                 super(AddressList, self).__init__()
-                self.replace(addresses)
+                
+                if isinstance(addresses, (basestring, tuple)):
+                        addresses = [addresses]
+                
+                if addresses is not None:
+                        self.extend(addresses)
         
-        def replace(self, addresses=[]):
-                del self[:]
-                if not addresses: return
-                self.extend(isinstance(addresses, list) and addresses or [addresses])
+        def __repr__(self):
+                if not self: return "AddressList()"
+                return "AddressList(\"" + "\", \"".join([str(i) for i in self]) + "\")"
         
         def __str__(self):
-                addresses = []
+                return ",\n ".join([str(i) for i in self])
+        
+        def __setitem__(self, k, value):
+                if not isinstance(value, Address):
+                        value = Address(value)
                 
-                for address in self:
-                        if type(address) == type(()):
-                                addresses.append(formataddr(address)) # Header(address[0]) was to encode names.  Still nessicary?
-                        else: addresses.append(address)
+                super(AddressList, self).__setitem__(k, value)
+        
+        def extend(self, value):
+                values = []
                 
-                return ",\n ".join(addresses)
+                for i in value:
+                        if not isinstance(i, Address):
+                                i = Address(i)
+                        values.append(i)
+                
+                super(AddressList, self).extend(values)
+        
+        def append(self, value):
+                self.extend([value])
+        
+        def addresses(self):
+                return AddressList([i.address for i in self])
+        
+        addresses = property(addresses)
+        
+        def protected(cls, field):
+                def fget(self):
+                        return getattr(self, field)
+
+                def fset(self, value):
+                        if not isinstance(value, AddressList):
+                                value = AddressList(value)
+
+                        setattr(self, field, AddressList(value))
+
+                def fdel(self):
+                        setattr(self, field, AddressList())
+
+                return property(fget, fset, fdel)
+        
+        protected = classmethod(protected)
+
+
+def send(message):
+        if not turbomail.manager:
+                raise MailNotEnabledError
+        
+        return turbomail.manager.deliver(message)