mailmanager MailMixin.py,1.32.2.4,1.32.2.5

[Graeme M. <ma...@us...>]

Update of /cvsroot/mailmanager/mailmanager
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32264

Modified Files:
      Tag: RELENG_2_0
	MailMixin.py 
Log Message:
* sendMail is no longer used, since we use the MailHost object.


Index: MailMixin.py
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/MailMixin.py,v
retrieving revision 1.32.2.4
retrieving revision 1.32.2.5
diff -u -d -r1.32.2.4 -r1.32.2.5
--- MailMixin.py	25 May 2005 14:08:16 -0000	1.32.2.4
+++ MailMixin.py	31 May 2005 15:53:30 -0000	1.32.2.5
@@ -385,64 +385,3 @@
             del request.other[attr]
         except KeyError:
             pass
-
-    # Sending Mail
-    
-    def sendMail(self, mail_from, recipients, msg, REQUEST=None):
-        """Sends an email."""
-        emsg = exc = None
-        # Open connexion.
-        try:
-            smtpserver = smtplib.SMTP(self.smtp_server, self.smtp_port)
-        except (smtplib.SMTPConnectError, smtplib.SMTPServerDisconnected,
-                socket.error), exc:
-            emsg = 'Message not sent: problem connecting to mail server.'
-        else:
-            # Remove Bcc.
-            bcc = msg['bcc']
-            if bcc is not None:
-                del msg['bcc']
-            # Send message.
-            recips = reduce(operator.add, recipients.values())
-            try:
-                rd = smtpserver.sendmail(mail_from, recips, msg.as_string())
-                if rd:
-                    emsg = ('Message could not be delivered to the '
-                            'following addresses: %s' % ', '.join(rd.keys()))
-                    if REQUEST is not None:
-                        REQUEST.set('flag_mail_to', 1)
-                        REQUEST.set('mail_to', ', '.join(rd.keys()))
-                        self._clearFromRequest(REQUEST, 'cc')
-                        self._clearFromRequest(REQUEST, 'bcc')
-            except (smtplib.SMTPHeloError, smtplib.SMTPDataError), exc:
-                emsg = ('Message not sent: '
-                        'mail server made unexpected or incorrect response.')
-            except smtplib.SMTPSenderRefused, exc:
-                emsg = ('Message not sent: please check that this account is '
-                        'associated with a valid e-mail address.')
-            except smtplib.SMTPRecipientsRefused, exc:
-                rd = exc.recipients
-                emsg = ('Message not sent: could not be delivered to any '
-                        'of the addresses given.')
-                if REQUEST is not None:
-                    REQUEST.set('flag_mail_to', 1)
-                    if recipients.has_key('cc'):
-                        REQUEST.set('flag_cc', 1)
-                    if recipients.has_key('bcc'):
-                        REQUEST.set('flag_bcc', 1)
-            smtpserver.quit()
-            # Restore Bcc.
-            if bcc is not None:
-                msg['bcc'] = bcc
-        # Report problems.
-        if emsg is not None:
-            if REQUEST is not None:
-                REQUEST.set('error', emsg)
-            elif exc is not None:
-                zLOG.LOG('MailManager: sendMail:', 0,
-                         '%s: %s' % (exc.__class__.__name__, exc))
-            else:
-                zLOG.LOG('MailManager: sendMail:', 0, emsg)
-        # Return two flags: "keep message" (true iff the message was sent
-        # at all), and "clear request" (true iff there were no problems).
-        return not exc, not emsg