Adding some fixes

Author: ajford

flask_sendmail/__init__.py

@@ -1,14 +1,22 @@
 """
-Module provides an interface to the system's sendmail client.
+    flask_sendmail
+    ~~~~~~~~~~~~~~
+    
+    Module provides an interface to the system's sendmail client.
 
-It's based heavily off of Flask-Mail (originaly by danjac),
-and owes a majority of its code to him.
+    It's based heavily off of Flask-Mail (written by danjac),
+    and owes a majority of its code to it.
 
+    It's also designed to be a nearly complete drop-in replacement
+    for Flask-Mail.
+
+    :copyright: (c) 2012 by Anthony Ford.
+    :license: None, see LICENSE for more details.
 """
-from flask.ext.sendmail.message import Message
-from flask.ext.sendmail.connection import Connection
+from flask_sendmail.message import Message, BadHeaderError
+from flask_sendmail.connection import Connection
 
-class Mailer(object):
+class Mail(object):
 
     def __init__(self,app=None):
         if app is not None:
@@ -18,7 +26,7 @@ def init_app(self, app):
         """
         Initializes your mail settings from app.config
 
-        Can be used to set up the Mailer at configuration time
+        Can be used to set up Mail at configuration time
 
         :param app: Flask application instance
         """
@@ -28,19 +36,19 @@ def init_app(self, app):
         self.mailer_flags = app.config.get('MAIL_MAILER_FLAGS','-t')
         self.suppress = app.config.get('MAIL_SUPPRESS_SEND', False)
         self.fail_silently = app.config.get('MAIL_FAIL_SILENTLY', True)
-
+        self.max_emails=None
         self.suppress = self.suppress or app.testing
         self.app = app
 
-        #register extenshion with app
+        #register extension with app
         app.extensions = getattr(app, 'extensions', {})
         app.extensions['sendmail'] = self
 
     def send(self,message):
         """
         Sends message through system's sendmail client.
 
-        :param message: Mailer Message instance
+        :param message: Mail Message instance
         """
 
         with self.connect() as connection:
@@ -60,4 +68,4 @@ def connect(self, max_emails=None):
         Opens a connection to the system's sendmail client.
         """
 
-        return Connection(self, max_email)
+        return Connection(self, max_emails)

flask_sendmail/connection.py

@@ -1,5 +1,7 @@
 from subprocess import PIPE,STDOUT,Popen
 
+from flask_sendmail.message import Message
+
 
 class Connection(object):
     """Handles connection to host."""
@@ -12,10 +14,26 @@ def __init__(self, mail, max_emails=None):
         self.max_emails = max_emails or self.mail.max_emails or 0
         self.fail_silently = self.mail.fail_silently
 
+    def __enter__(self):
+        pass
+
     def send(self,message):
         sm = Popen([self.mailer,self.mailer_flags], stdin=PIPE, stdout=PIPE,
                     stderr=STDOUT)
         sm.stdin.write(message.dump())
         sm.communicate()
 
         return sm.returncode
+
+    def __exit__(self, exc_type, exc_value, tb):
+        pass
+
+    def send_message(self, *args, **kwargs):
+        """
+        Shortcut for send(msg).
+
+        Takes same arguments as Message constructor.
+        """
+
+        self.send(Message(*args, **kwargs))
+

flask_sendmail/message.py

@@ -31,10 +31,6 @@ def __init__(self, subject, recipients=None, body=None, html=None,
             app = stack.top.app
             sender = app.config.get("DEFAULT_MAIL_SENDER")
 
-        if isinstance(sender, tuple):
-            # sender can be tuple of (name, address)
-            sender = "%s <%s>" % sender
-
         self.subject = subject
         self.sender = sender
         self.body = body
@@ -58,7 +54,7 @@ def add_recipient(self, recipient):
         """
         Adds another recipient to the message.
 
-        :param recipient: email address of recipient.
+        :param recipient: email address.
         """
 
         self.recipients.append(recipient)
@@ -74,20 +70,31 @@ def is_bad_headers(self):
                 if c in val:
                     return True
         return False
-    
+   
     def dump(self):
         if self.html:
             msg = MIMEText(self.html,'html')
         elif self.body:
             msg = MIMEText(self.body)
+
+        if isinstance(self.sender, tuple):
+            # sender can be tuple of (name, address)
+            self.sender = "%s <%s>" % self.sender
+        
 
         msg['Subject'] = self.subject
         msg['To'] = ', '.join(self.recipients) 
         msg['From'] = self.sender
         if self.cc:
-            msg['CC'] = self.cc
+            if hasattr(self.cc,'__iter__'):
+                msg['Cc'] = ', '.join(self.cc)
+            else:
+                msg['Cc'] = self.cc
         if self.bcc:
-            msg['BCC'] = self.bcc
+            if hasattr(self.bcc,'__iter__'):
+                msg['Bcc'] = ', '.join(self.bcc)
+            else:
+                msg['Bcc'] = self.bcc
         if self.reply_to:
             msg['Reply-To'] = self.reply_to