innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Changed django.core.mail to use [Django] prefix instead of [CMS] 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@54 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2005-07-15 16:47:19 +00:00
parent 88ee7bb134
commit eb9c9ab4d0
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
django/core/mail.py
View File

@ -1,6 +1,4 @@
""" # Use this module for e-mailing.
Use this for e-mailing
"""
from django.conf.settings import DEFAULT_FROM_EMAIL, EMAIL_HOST from django.conf.settings import DEFAULT_FROM_EMAIL, EMAIL_HOST
from email.MIMEText import MIMEText from email.MIMEText import MIMEText
@ -43,9 +41,9 @@ def send_mass_mail(datatuple, fail_silently=False):
def mail_admins(subject, message, fail_silently=False): def mail_admins(subject, message, fail_silently=False):
"Sends a message to the admins, as defined by the ADMINS constant in settings.py." "Sends a message to the admins, as defined by the ADMINS constant in settings.py."
from django.conf.settings import ADMINS, SERVER_EMAIL from django.conf.settings import ADMINS, SERVER_EMAIL
send_mail('[CMS] ' + subject, message, SERVER_EMAIL, [a[1] for a in ADMINS], fail_silently) send_mail('[Django] ' + subject, message, SERVER_EMAIL, [a[1] for a in ADMINS], fail_silently)
def mail_managers(subject, message, fail_silently=False): def mail_managers(subject, message, fail_silently=False):
"Sends a message to the managers, as defined by the MANAGERS constant in settings.py" "Sends a message to the managers, as defined by the MANAGERS constant in settings.py"
from django.conf.settings import MANAGERS, SERVER_EMAIL from django.conf.settings import MANAGERS, SERVER_EMAIL
send_mail('[CMS] ' + subject, message, SERVER_EMAIL, [a[1] for a in MANAGERS], fail_silently) send_mail('[Django] ' + subject, message, SERVER_EMAIL, [a[1] for a in MANAGERS], fail_silently)