equal
deleted
inserted
replaced
194 self._GenerateLog('Send', request, log) |
194 self._GenerateLog('Send', request, log) |
195 |
195 |
196 if self._smtp_host and self._enable_sendmail: |
196 if self._smtp_host and self._enable_sendmail: |
197 log('Both SMTP and sendmail are enabled. Ignoring sendmail.') |
197 log('Both SMTP and sendmail are enabled. Ignoring sendmail.') |
198 |
198 |
|
199 import email |
|
200 |
199 mime_message = mail.MailMessageToMIMEMessage(request) |
201 mime_message = mail.MailMessageToMIMEMessage(request) |
200 if self._smtp_host: |
202 if self._smtp_host: |
201 self._SendSMTP(mime_message, smtp_lib) |
203 self._SendSMTP(mime_message, smtp_lib) |
202 elif self._enable_sendmail: |
204 elif self._enable_sendmail: |
203 self._SendSendmail(mime_message, popen, sendmail_command) |
205 self._SendSendmail(mime_message, popen, sendmail_command) |