Changeset 68 for branches/3.0/turbomail/message.py

Timestamp:

11/07/07 15:03:24 (1 year ago)

Author:

amcgregor

Message:

A large number of branch/3.0 updates.

Files:

• branches/3.0/turbomail/message.py (modified) (4 diffs)

branches/3.0/turbomail/message.py

@@ -33 +33 @@
         This allows you to define your own message to be delivered."""
         
-        def __init__(self, sender, recipient, message):
+        def __init__(self, envelope, recipient, message):
                 self.id = str(uuid())
-                self.sender = AddressList(sender)
+                self.envelope = AddressList(envelope)
                 self.recipient = AddressList(recipient)
                 self.message = message
                 
                 super(StubMessage, self).__init__()
-        
-        envelope = proeprty(lambda self: self.sender)
         
         def __str__(self):
@@ -72 +70 @@
                 if 'senders' in kw: kw['sender'] == kw['senders']
                 
-                self._author = AddressList(configget("from", "mail.message.author"))
+                self._author = AddressList(configget("author", "mail.message.author"))
                 self._sender = AddressList(configget("sender", "mail.message.sender"))
                 self._reply = AddressList(configget("reply", "mail.message.reply"))
@@ -135 +133 @@
         recipients = property(recipients)
         
-        def mimeDocument(self, plain, rich=None):
+        def mime_document(self, plain, rich=None):
                 if not rich:
                         message = plain
@@ -179 +177 @@
                         rich = MIMEText(self._callable(self.rich).encode(self.encoding), 'html', self.encoding)
                 
-                message = self.generate_mime_document(plain, rich)
-                
-                if hasattr(self, "process_mime_message"):
-                        message = self.process_mime_message(message)
+                message = self.mime_document(plain, rich)
                 
                 headers = [