Changeset 113 for trunk

Timestamp:

11/07/08 15:13:58 (2 months ago)

Author:

amcgregor

Message:

Made exceptions consistent by changing the Error suffix to Exception, solving ticket #85.

Location:

trunk

Files:

• tests/test_tm2_compatibility.py (modified) (2 diffs)
• turbomail/control.py (modified) (2 diffs)
• turbomail/exceptions.py (modified) (3 diffs)
• turbomail/providers/smtp.py (modified) (2 diffs)

trunk/tests/test_tm2_compatibility.py

@@ -7 +7 @@
 
 import turbomail
-from turbomail import Message, MailNotEnabledError
+from turbomail import Message, MailNotEnabledException
 from turbomail.managers.immediate import ImmediateManager
 from turbomail.providers.debug import DebugProviderFactory
@@ -53 +53 @@
         message = Message('from@example.com', 'to@example.com', 'Test')
         message.plain = 'Hello world!'
-        self.assertRaises(MailNotEnabledError, turbomail.enqueue, message)
+        self.assertRaises(MailNotEnabledException, turbomail.enqueue, message)
     
     def test_message_enqueue(self):

trunk/turbomail/control.py

@@ -31 +31 @@
 
 
-from turbomail.exceptions import MailNotEnabledError
+from turbomail.exceptions import MailNotEnabledException
 
 class ControlClass(object):
@@ -125 +125 @@
     def send(self, message):
         if not self.manager:
-            raise MailNotEnabledError
+            raise MailNotEnabledException
         
         return self.manager.deliver(message)

trunk/turbomail/exceptions.py

@@ -4 +4 @@
 
 __version__ = "$Revision$"
-__all__ = ['MailException', 'MailNotEnabledError', 'MailConfigurationError', 
+__all__ = ['MailException', 'MailNotEnabledException', 'MailConfigurationException', 
            'ProviderException', 'ProviderExhaustedException', 'ManagerException']
 
@@ -14 +14 @@
 
 
-class MailNotEnabledError(MailException):
+class MailNotEnabledException(MailException):
     """Attempted to use TurboMail before being enabled."""
     
@@ -23 +23 @@
 
 
-class MailConfigurationError(MailException):
+class MailConfigurationException(MailException):
     """There was an error in the configuration of TurboMail."""
     

trunk/turbomail/providers/smtp.py

@@ -11 +11 @@
 
 from turbomail.api import ProviderFactory, Provider
-from turbomail.exceptions import MailConfigurationError, ProviderExhaustedException
+from turbomail.exceptions import MailConfigurationException, ProviderExhaustedException
 from turbomail.control import interface
 
@@ -38 +38 @@
         self.count = self.config_get("mail.smtp.count", default=10, tm2_key='jobs')
         
-        # Defaults to localhost -- if self.server is None: raise MailConfigurationError, "You must define mail.smtp.server in your configuration."
+        # Defaults to localhost -- if self.server is None: raise MailConfigurationException, "You must define mail.smtp.server in your configuration."
         
         self.connection = SMTP()