mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-05 03:29:12 +00:00
Code Issues 32 Releases Wiki Activity

magic-removal: Fixed #1384 - ugly bug in mail_admins. Added additional try blocks.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2433 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Duncan Foster 2006-02-28 01:01:01 +00:00
parent 04b22e5002
commit f9ed0eded9
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
django/core/mail.py
View File

@ -43,9 +43,19 @@ def send_mass_mail(datatuple, fail_silently=False):
msg['Subject'] = subject msg['Subject'] = subject
msg['From'] = from_email msg['From'] = from_email
msg['To'] = ', '.join(recipient_list) msg['To'] = ', '.join(recipient_list)
server.sendmail(from_email, recipient_list, msg.as_string()) try:
num_sent += 1 server.sendmail(from_email, recipient_list, msg.as_string())
server.quit() num_sent += 1
except:
if fail_silently:
return
raise
try:
server.quit()
except:
if fail_silently:
return
raise
return num_sent return num_sent
def mail_admins(subject, message, fail_silently=False): def mail_admins(subject, message, fail_silently=False):