Changeset 68

Timestamp:

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

Author:

amcgregor

Message:

A large number of branch/3.0 updates.

Location:

branches/3.0

Files:

• setup.py (modified) (1 diff)
• tests/test_message.py (modified) (2 diffs)
• turbomail/control.py (modified) (2 diffs)
• turbomail/extensions/notification.py (added)
• turbomail/extensions/smime.py (modified) (3 diffs)
• turbomail/extensions/utf8qp.py (modified) (2 diffs)
• turbomail/managers/demand.py (modified) (1 diff)
• turbomail/message.py (modified) (4 diffs)
• turbomail/providers/debug.py (modified) (1 diff)

branches/3.0/setup.py

@@ -65 +65 @@
                         'turbomail.extensions': [
                                 "utf8qp = turbomail.extensions.utf8qp",
+#                               "notification = turbomail.extensions.notification",
 #                               "smime = turbomail.extensions.smime",
 #                               "gpg = turbomail.extensions.gpg",

branches/3.0/tests/test_message.py

@@ -18 +18 @@
         def setUp(self):
                 self.message = Message(
-                                sender=("Sender", "sender@example.com"),
+                                author=("Author", "author@example.com"),
                                 to=("Recipient", "recipient@example.com"),
                                 subject="Test message subject.",
@@ -25 +25 @@
         
         def test_message_properties(self):
-                self.assertEqual(self.message.sender, [("Sender", "sender@example.com")])
-                self.assertEqual(str(self.message.sender), "Sender <sender@example.com>")
+                self.assertEqual(self.message.author, [("Author", "author@example.com")])
+                self.assertEqual(str(self.message.author), "Author <author@example.com>")
                 self.failUnless(isinstance(self.message.mime, MIMEText))
         
         def test_message_string(self):
                 self.failUnless("To: Recipient <recipient@example.com>" in str(self.message))
-                self.failUnless("From: Sender <sender@example.com>" in str(self.message))
+                self.failUnless("From: Author <author@example.com>" in str(self.message))
                 self.failUnless("Subject: Test message subject." in str(self.message))
                 self.failUnless("\n\nThis is a test message plain text body." in str(self.message))
+        
+        def test_mime_generation(self):
+                mime = self.message.mime
+                self.failUnless(self.message.mime is mime)
+                self.message.subject = "Test message subject."
+                self.failIf(self.message.mime is mime)
         
         def test_recipients_collection(self):

branches/3.0/turbomail/control.py

@@ -43 +43 @@
                 try:
                         import turbogears
-                except ImportError:
-                        turbomail.config = dict()
-                else:
-                        if not hasattr(turbomail, 'config'):
-                                turbomail.config = dict()
-                                return
                         
                         turbogears.config.update(turbomail.config)
@@ -54 +48 @@
                         self.start_extension = self.start
                         self.shutdown_extension = self.stop
+                
+                except ImportError:
+                        pass
+                
+                except AttributeError:
+                        pass
         
         def load_single_entry(self, group, name):

branches/3.0/turbomail/extensions/smime.py

@@ -25 +25 @@
                 self.force = kw.get("force", turbomail.config.get("mail.smime.force", False))
         
-        def process_mime_message(self, message):
-                newmessage = message
+        def mime_document(self, plain, rich=None):
+                message = super(Message, self).mime_document(plain, rich)
                 basepath = turbomail.config.get("mail.smime.keystore", "./")
                 
@@ -32 +32 @@
                         from M2Crypto import BIO, Rand, SMIME
                         
-                        # Make a MemoryBuffer of the message.
                         buf = BIO.MemoryBuffer(str(message))
-                        
-                        # Seed the PRNG.
                         Rand.load_file('randpool.dat', -1)
                         
-                        # Instantiate an SMIME object; set it up; sign the buffer.
                         s = SMIME.SMIME()
                         s.load_key(
@@ -56 +52 @@
                         del signature['Content-Disposition']
                         signature.add_header("Content-Disposition", "attachment", filename="smime.p7s")
-                        
                         newmessage.attach(signature)
                         
-                        # Save the PRNG's state.
                         Rand.save_file('randpool.dat')
+                        
+                        return newmessage
                 
-                return newmessage
+                return message

branches/3.0/turbomail/extensions/utf8qp.py

@@ -1 +1 @@
 # encoding: utf-8
 
-"""TurboMail extension API."""
+"""TurboMail UTF-8 quoted-printable encoding sample extension."""
 
 __version__ = "$Revision$"
@@ -13 +13 @@
 from email import Charset
 
-__all__ = ['start']
+__all__ = ['load']
 
 

branches/3.0/turbomail/managers/demand.py

@@ -70 +70 @@
                                 self.spawn()
                 
+                return True
+                
         def wrapper(self):
                 log.debug("Mail queue worker starting up.")
                 
-                self.worker()
+                try:
+                        self.worker()
+                
+                except:
+                        log.exception("Internal error in worker thread.")
                 
                 self.pool -= 1

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 = [

branches/3.0/turbomail/providers/debug.py

@@ -31 +31 @@
                 log.info("Attempting delivery of message %s." % message.id)
                 deliverylog.info("%s DELIVER" % message.id)
-                deliverylog.debug("%s SUBJECT \"%s\"" % (message.id, message.subject))
-                deliverylog.debug("%s FROM%s %s" % (message.id, len(message.author) != 1 and "S" or "", str(message.author.addresses).replace("\n", "")))
-                if message.senders:
-                        deliverylog.debug("%s SENDER%s %s" % (message.id, len(message.sender) != 1 and "S" or "", str(message.sender.addresses).replace("\n", "")))
-                deliverylog.debug("%s RECIPIENTS %s" % (message.id, str(message.recipients.addresses).replace("\n", "")))
                 
                 for i in str(message).split("\n"):