Changeset 66

Timestamp:

11/07/07 02:53:29 (1 year ago)

Author:

amcgregor

Message:

Added Revision keyword to appropriate files.

Location:

branches/3.0

Files:

• setup.cfg (modified) (1 diff, 1 prop)
• setup.py (modified) (2 diffs, 1 prop)
• turbomail/api.py (modified) (1 diff, 1 prop)
• turbomail/control.py (modified) (1 diff, 1 prop)
• turbomail/exceptions.py (modified) (1 diff, 1 prop)
• turbomail/extensions/smime.py (added)
• turbomail/extensions/utf8qp.py (modified) (1 diff, 1 prop)
• turbomail/managers/demand.py (modified) (1 diff, 1 prop)
• turbomail/managers/immediate.py (modified) (1 diff, 1 prop)
• turbomail/message.py (modified) (9 diffs, 1 prop)
• turbomail/providers/debug.py (modified) (1 diff, 1 prop)
• turbomail/providers/smtp.py (modified) (1 diff, 1 prop)
• turbomail/release.py (modified) (1 diff, 1 prop)
• turbomail/util.py (modified) (1 diff, 1 prop)

branches/3.0/setup.cfg

@@ +1 @@
+# $Revision$
+
 [egg_info]
 tag_build = .dev

branches/3.0/setup.py

@@ -1 +1 @@
 #!/usr/bin/env python
 # encoding: utf-8
+
+__version__ = "$Revision$"
 
 import sys
@@ -63 +65 @@
                         'turbomail.extensions': [
                                 "utf8qp = turbomail.extensions.utf8qp",
-                                "smime = turbomail.extensions.smime",
+#                               "smime = turbomail.extensions.smime",
 #                               "gpg = turbomail.extensions.gpg",
                         ]

branches/3.0/turbomail/api.py

@@ -3 +3 @@
 """TurboMail extension API."""
 
-__version__ = "$Revision: 1 $"
+__version__ = "$Revision$"
 __all__ = ['Extension', 'ProviderFactory', 'Provider', 'Manager']
 

branches/3.0/turbomail/control.py

@@ -20 +20 @@
 """
 
-__version__ = "$Revision: 1 $"
+__version__ = "$Revision$"
 
 import logging

branches/3.0/turbomail/exceptions.py

@@ -3 +3 @@
 """Exceptions used by TurboMail to report common errors."""
 
-__version__ = "$Revision: 1 $"
+__version__ = "$Revision$"
 __all__ = ['MailException', 'MailNotEnabledError', 'MailConfigurationError', 'ProviderException', 'ProviderExhaustedException', 'ManagerException']
 

branches/3.0/turbomail/extensions/utf8qp.py

@@ -3 +3 @@
 """TurboMail extension API."""
 
-__version__ = "$Revision: 1 $"
+__version__ = "$Revision$"
 
 import logging

branches/3.0/turbomail/managers/demand.py

@@ -3 +3 @@
 """TurboMail extension API."""
 
-__version__ = "$Revision: 1 $"
+__version__ = "$Revision$"
 
 import logging

branches/3.0/turbomail/managers/immediate.py

@@ -3 +3 @@
 """TurboMail extension API."""
 
-__version__ = "$Revision: 1 $"
+__version__ = "$Revision$"
 
 import logging

branches/3.0/turbomail/message.py

@@ -2 +2 @@
 
 """MIME-encoded electronic mail message classes."""
+
+__version__ = "$Revision$"
 
 import turbomail
@@ -17 +19 @@
 from email.Header import Header
 
-from uuid import uuid4 as uuid
+from uuid import uuid1 as uuid
 
 import logging
@@ -31 +33 @@
         This allows you to define your own message to be delivered."""
         
-        def __init__(self, id=None, sender=None, recipients=[], message=None):
-                self.id = id
-                self.sender = sender
-                self.recipients = recipients
+        def __init__(self, sender, recipient, message):
+                self.id = str(uuid())
+                self.sender = AddressList(sender)
+                self.recipient = AddressList(recipient)
                 self.message = message
                 
-                if not self.id: self.id = uuid()
-                
                 super(StubMessage, self).__init__()
+        
+        envelope = proeprty(lambda self: self.sender)
         
         def __str__(self):
@@ -114 +116 @@
                 if not self._id or (self._processed and self._dirty):
                         self.__dict__['_id'] = str(uuid())
+                        
                         self._processed = False
                 
@@ -122 +125 @@
         def envelope(self):
                 if self.sender and self.senders != self.author:
-                        return AddressList(self.senders)
+                        return AddressList(self.sender)
                 return AddressList(self.author)
         
@@ -132 +135 @@
         recipients = property(recipients)
         
-        def mime(self):
-                """Produce the final MIME message."""
-
-                assert self.author, "You must specify an author."
-                assert self.subject, "You must specify a subject."
-                assert self.to or self.cc or self.bcc, "You must specify at least one recipient."
-                assert self.plain, "You must provide plain text content."
-
-                #if not self._dirty and self._processed:
-                #       return self._mime
-                
-                self._processed = False
-                
-                plain = MIMEText(self._callable(self.plain).encode(self.encoding), 'plain', self.encoding)
-                
-                rich = None
-                if self.rich:
-                        rich = MIMEText(self._callable(self.rich).encode(self.encoding), 'html', self.encoding)
-                
-                def generate_mime():
-                        if not rich: return plain
-                        
+        def mimeDocument(self, plain, rich=None):
+                if not rich:
+                        message = plain
+                
+                else:
                         message = MIMEMultipart('alternative')
                         message.attach(plain)
-                        
+                
                         if not self.embedded:
                                 message.attach(rich)
-                        
+                
                         else:
                                 embedded = MIMEMultipart('related')
@@ -165 +151 @@
                                 for attachment in self.embedded: embedded.attach(attachment)
                                 message.attach(embedded)
-                        
-                        return message
-                
-                message = generate_mime()
                 
                 if self.attachments:
@@ -175 +157 @@
                         for attachment in self.attachments: attachments.attach(attachment)
                         message = attachments
+                
+                return message
+        
+        def mime(self):
+                """Produce the final MIME message."""
+
+                assert self.author, "You must specify an author."
+                assert self.subject, "You must specify a subject."
+                assert self.to or self.cc or self.bcc, "You must specify at least one recipient."
+                assert self.plain, "You must provide plain text content."
+
+                if not self._dirty and self._processed and not turbomail.config.get("mail.debug", False):
+                        return self._mime
+                
+                self._processed = False
+                
+                plain = MIMEText(self._callable(self.plain).encode(self.encoding), 'plain', self.encoding)
+                
+                rich = None
+                if self.rich:
+                        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"):
@@ -196 +201 @@
                                         ('X-Mailer', "%s <%s>" % (release.name, release.url)),
                                         ('X-TurboMail-Version', release.version),
-                                        ('X-TurboMail-Message-GUID', self.id),
                                 ])
+                        
+                        if turbomail.config.get("mail.debug", False):
+                                headers.append(('X-TurboMail-Message-GUID', self.id))
                         
                         if turbomail.provider:

branches/3.0/turbomail/providers/debug.py

@@ -3 +3 @@
 """TurboMail extension API."""
 
-__version__ = "$Revision: 1 $"
+__version__ = "$Revision$"
 
 import logging

branches/3.0/turbomail/providers/smtp.py

@@ -3 +3 @@
 """TurboMail extension API."""
 
-__version__ = "$Revision: 1 $"
+__version__ = "$Revision$"
 
 import logging

branches/3.0/turbomail/release.py

@@ -3 +3 @@
 """Release information about TurboMail."""
 
-__version__ = "$Revision: 1 $"
+__version__ = "$Revision$"
 
 name = "TurboMail"

branches/3.0/turbomail/util.py

@@ -3 +3 @@
 """MIME-encoded electronic mail message classes."""
 
-__version__ = "$Revision: 1 $"
+__version__ = "$Revision$"
 
 import re