Don't try to do string join on None, in case any address in an address list given to the mail sending routines is missing and represented by None.

- Legacy-Id: 3111
This commit is contained in:
Henrik Levkowetz 2011-05-10 12:13:40 +00:00
parent cf10bc0fd0
commit e904041ea9

View file

@ -157,9 +157,9 @@ def send_mail_mime(request, to, frm, subject, msg, cc=None, extra=None, toUser=N
if isinstance(frm, tuple):
frm = formataddr(frm)
if isinstance(to, list) or isinstance(to, tuple):
to = ", ".join([isinstance(addr, tuple) and formataddr(addr) or addr for addr in to])
to = ", ".join([isinstance(addr, tuple) and formataddr(addr) or addr for addr in to if addr])
if isinstance(cc, list) or isinstance(cc, tuple):
cc = ", ".join([isinstance(addr, tuple) and formataddr(addr) or addr for addr in cc])
cc = ", ".join([isinstance(addr, tuple) and formataddr(addr) or addr for addr in cc if addr])
if frm:
msg['From'] = frm
msg['To'] = to