Changeset 36 for branches

Timestamp:

10/17/07 04:49:47 (1 year ago)

Author:

mbevan

Message:

Updates to the Message class and a simple unit test.

Location:

branches/3.0

Files:

• tests (added)
• tests/__init__.py (added)
• tests/test_message.py (added)
• turbomail/message.py (modified) (5 diffs)
• turbomail/util.py (modified) (2 diffs)

branches/3.0/turbomail/message.py

@@ -23 +23 @@
 __all__ = ['Message']
 _rich_to_plain = re.compile(r"(<[^>]+>)")
+
+
+class StubMessage(object):
+        def __init__(self, sender=None, recipients=[], message=None):
+                self.sender = sender
+                self.recipients = recipients
+                self.message = message
+        
+        def __str__(self):
+                assert self.sender
+                assert self.recipients
+                assert self.message
+                
+                return self.message
 
 
@@ -70 +84 @@
                 self.embedded = []
                 self.headers = turbomail.config.get("mail.message.headers", [])
+                self.tries = turbomail.config.get("mail.tries", 3)
                 
                 for i, j in kw.iteritems():
@@ -95 +110 @@
         @property
         def recipients(self):
-                return self.to + self.cc + self.bcc
+                return [isinstance(i, tuple) and i[1] or i for i in self.to + self.cc + self.bcc]
         
         @property
@@ -138 +153 @@
 
                 headers = [
-                                ('Sender', self.envelope and self.envelope or AddressList(self.sender[0])), # AddressList
+                                ('Sender', self.envelope and self.envelope[0] or AddressList(self.sender[0])), # AddressList
                                 ('From', self.sender), # AddressList
                                 ('Reply-To', self.reply), # AddressList
@@ -150 +165 @@
                                 ('X-Mailer', "TurboMail <http://www.python-turbomail.org/>"),
                                 ('X-TurboMail-Version', version),
-                                ('X-TurboMail-Extensions', "")
+                                ('X-TurboMail-Extensions', "manager.demand v.1.0, provider.smtp v.1.0")
                         ]
 

branches/3.0/turbomail/util.py

@@ -4 +4 @@
 
 from email.Header import Header
-
+from email.utils import formataddr
 
 __all__ = ['AddressList']
@@ -26 +26 @@
                 for address in self:
                         if type(address) == type(()):
-                                addresses.append('"%s" <%s>' % (str(Header(address[0])), address[1]))
+                                addresses.append(formataddr(address)) # Header(address[0]) was to encode names.  Still nessicary?
                         else: addresses.append(address)