Mercurial > p > roundup > code
diff roundup/mailgw.py @ 1096:fa7df238e2d4
More cleaning up of configuration, and the "instance" -> "tracker" renaming.
| author | Richard Jones <richard@users.sourceforge.net> |
|---|---|
| date | Tue, 10 Sep 2002 03:01:20 +0000 |
| parents | 711f2ecee20f |
| children | db787cef1385 |
line wrap: on
line diff
--- a/roundup/mailgw.py Tue Sep 10 02:37:28 2002 +0000 +++ b/roundup/mailgw.py Tue Sep 10 03:01:20 2002 +0000 @@ -73,7 +73,7 @@ an exception, the original message is bounced back to the sender with the explanatory message given in the exception. -$Id: mailgw.py,v 1.84 2002-09-10 02:37:27 richard Exp $ +$Id: mailgw.py,v 1.85 2002-09-10 03:01:18 richard Exp $ ''' import string, re, os, mimetools, cStringIO, smtplib, socket, binascii, quopri @@ -239,8 +239,8 @@ msg = cStringIO.StringIO() writer = MimeWriter.MimeWriter(msg) writer.addheader('Subject', subject) - writer.addheader('From', '%s <%s>'% (self.instance.config.INSTANCE_NAME, - self.instance.config.ISSUE_TRACKER_EMAIL)) + writer.addheader('From', '%s <%s>'% (self.instance.config.TRACKER_NAME, + self.instance.config.TRACKER_EMAIL)) writer.addheader('To', ','.join(sendto)) writer.addheader('MIME-Version', '1.0') part = writer.startmultipartbody('mixed') @@ -561,7 +561,7 @@ # now update the recipients list recipients = [] - tracker_email = self.instance.config.ISSUE_TRACKER_EMAIL.lower() + tracker_email = self.instance.config.TRACKER_EMAIL.lower() for recipient in message.getaddrlist('to') + message.getaddrlist('cc'): r = recipient[1].strip().lower() if r == tracker_email or not r: