[PyWebMail-Checkins] webmail/webmail/backends smtp.py,1.6,1.7
Status: Beta
Brought to you by:
dubnerm
From: Michael D. <du...@us...> - 2008-03-04 07:14:57
|
Update of /cvsroot/pywebmail/webmail/webmail/backends In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16193 Modified Files: smtp.py Log Message: sender handling was completely wrong Index: smtp.py =================================================================== RCS file: /cvsroot/pywebmail/webmail/webmail/backends/smtp.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** smtp.py 10 Dec 2007 06:57:10 -0000 1.6 --- smtp.py 4 Mar 2008 07:14:57 -0000 1.7 *************** *** 145,149 **** if l: recipients.extend(zip(*l)[1]) sender = headers.getaddr('from') ! assert sender[0].lower() != self.email.lower(), "Sender sanity check failed" smtp = smtplib.SMTP() smtp.set_debuglevel(self.debug) --- 145,149 ---- if l: recipients.extend(zip(*l)[1]) sender = headers.getaddr('from') ! assert sender[1].lower() == self.email.lower(), "Sender sanity check failed" smtp = smtplib.SMTP() smtp.set_debuglevel(self.debug) *************** *** 155,159 **** if self.auth: smtp.login(self.user, self.password) ! smtp.sendmail(sender, recipients, msg) smtp.quit() --- 155,159 ---- if self.auth: smtp.login(self.user, self.password) ! smtp.sendmail(sender[1], recipients, msg) smtp.quit() |