Ticket #72: turbomail_2x_compat_72

diff -r 8fe7f66d1b98 tests/test_message.py
--- a/tests/test_message.py     Mon Jul 14 21:59:31 2008 +0200
+++ b/tests/test_message.py     Mon Jul 14 22:00:42 2008 +0200
@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # encoding: utf-8
-
 """Test the TurboMail Message class."""
 
 
diff -r 8fe7f66d1b98 tests/test_tm2_compatibility.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test_tm2_compatibility.py   Mon Jul 14 22:00:42 2008 +0200
@@ -0,0 +1,55 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+'''Test that most interfaces of TurboMail 2.x are working in TurboMail 3.x'''
+
+import unittest
+
+from turbomail.managers.immediate import ImmediateManager
+from turbomail.providers.debug import DebugProviderFactory
+
+class TestTurboMail2xCompatibility(unittest.TestCase):
+    
+    def tearDown(self):
+        import turbomail
+        turbomail.control.interface.stop(force=True)
+        turbomail.control.interface.config = {'mail.on': False}
+    
+    def test_message_instantiation_with_positional_parameters(self):
+        from turbomail import Message
+        message = Message('from@example.com', 'to@example.com', 'Test')
+        message.plain = 'Hello world!'
+        msg_string = str(message)
+        self.failUnless('From: from@example.com' in msg_string)
+        self.failUnless('To: to@example.com' in msg_string)
+        self.failUnless('Subject: Test' in msg_string)
+    
+    def test_message_instantiation_with_keyword_parameters(self):
+        from turbomail import Message
+        message = Message(sender='from@example.com', recipient='to@example.com',
+                          subject='Test')
+        message.plain = 'Hello world!'
+        msg_string = str(message)
+        self.failUnless('From: from@example.com' in msg_string)
+        self.failUnless('To: to@example.com' in msg_string)
+        self.failUnless('Subject: Test' in msg_string)
+    
+    def test_message_enqueue_not_enabled(self):
+        import turbomail
+        from turbomail import Message
+        # TODO: Error or Exception?
+        from turbomail import MailNotEnabledError
+        message = Message('from@example.com', 'to@example.com', 'Test')
+        message.plain = 'Hello world!'
+        self.assertRaises(MailNotEnabledError, turbomail.enqueue, message)
+    
+    def test_message_enqueue(self):
+        import turbomail
+        from turbomail import Message
+        turbomail.control.interface.config = {'mail.on': True}
+        
+        turbomail.control.interface.start(manager=ImmediateManager(), 
+                                          provider=DebugProviderFactory())
+        message = Message('from@example.com', 'to@example.com', 'Test')
+        message.plain = 'Hello world!'
+        turbomail.enqueue(message)
+
diff -r 8fe7f66d1b98 turbomail/__init__.py
--- a/turbomail/__init__.py     Mon Jul 14 21:59:31 2008 +0200
+++ b/turbomail/__init__.py     Mon Jul 14 22:00:42 2008 +0200
@@ -0,0 +1,13 @@
+
+from turbomail.control import interface
+from turbomail.exceptions import *
+from turbomail.message import Message
+
+def send(message):
+    '''Send a message via TurboMail.'''
+    return interface.send(message)
+
+# Compatibility with TurboMail 2.x
+# Deprecated: Use 'send(message)' instead.
+enqueue = send
+
diff -r 8fe7f66d1b98 turbomail/exceptions.py
--- a/turbomail/exceptions.py   Mon Jul 14 21:59:31 2008 +0200
+++ b/turbomail/exceptions.py   Mon Jul 14 22:00:42 2008 +0200
@@ -3,7 +3,8 @@
 """Exceptions used by TurboMail to report common errors."""
 
 __version__ = "$Revision: 84 $"
-__all__ = ['MailException', 'MailNotEnabledError', 'MailConfigurationError', 'ProviderException', 'ProviderExhaustedException', 'ManagerException']
+__all__ = ['MailException', 'MailNotEnabledError', 'MailConfigurationError', 
+           'ProviderException', 'ProviderExhaustedException', 'ManagerException']
 
 
 class MailException(Exception):
diff -r 8fe7f66d1b98 turbomail/message.py
--- a/turbomail/message.py      Mon Jul 14 21:59:31 2008 +0200
+++ b/turbomail/message.py      Mon Jul 14 22:00:42 2008 +0200
@@ -7,7 +7,7 @@
 from turbomail import release
 from turbomail.util import AddressList
 from turbomail.control import interface
-import re, os, email
+import os
 
 import email.Message
 from email import Encoders, Charset
@@ -45,7 +45,7 @@
 class Message(object):
     """Simple e-mail message class."""
     
-    def __init__(self, **kw):
+    def __init__(self, sender=None, recipient=None, subject=None, **kw):
         """Instantiate a new Message object.
         
         No arguments are required, as everything can be set using class
@@ -64,8 +64,21 @@
         
         self.date = kw.get("date", formatdate(localtime=True))
         
+        if sender != None:
+            # TODO: Raise ValueError!
+            kw['from_'] = sender
+        if recipient != None:
+            kw['to'] = recipient
+        if subject != None:
+            kw['subject'] = subject
         if 'authors' in kw: kw['author'] == kw['authors']
         if 'senders' in kw: kw['sender'] == kw['senders']
+#        if 'authors' in kw: 
+#            kw['author'] = kw['authors']
+#        if 'senders' in kw:
+#            kw['sender'] = kw['senders']
+#        elif sender != None:
+#            kw['sender'] = sender
         
         self._from = AddressList(configget("from_", "mail.message.author"))
         self._sender = AddressList(configget("sender", "mail.message.sender"))