Django

Code

Changeset 2664

Show
Ignore:
Timestamp:
04/10/06 22:19:57 (3 years ago)
Author:
adrian
Message:

Converted django.core.mail to use 'from django.conf import settings' instead of importing specific settings directly

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/core/mail.py

    r2548 r2664  
    11# Use this module for e-mailing. 
    22 
    3 from django.conf.settings import DEFAULT_FROM_EMAIL, EMAIL_HOST, EMAIL_SUBJECT_PREFIX, EMAIL_HOST_USER, EMAIL_HOST_PASSWORD 
     3from django.conf import settings 
    44from email.MIMEText import MIMEText 
    55import smtplib 
    …… 
    1515        MIMEText.__setitem__(self, name, val) 
    1616 
    17 def send_mail(subject, message, from_email, recipient_list, fail_silently=False, auth_user=EMAIL_HOST_USER, auth_password=EMAIL_HOST_PASSWORD): 
     17def send_mail(subject, message, from_email, recipient_list, fail_silently=False, auth_user=settings.EMAIL_HOST_USER, auth_password=settings.EMAIL_HOST_PASSWORD): 
    1818    """ 
    1919    Easy wrapper for sending a single message to a recipient list. All members 
    …… 
    2222    return send_mass_mail([[subject, message, from_email, recipient_list]], fail_silently, auth_user, auth_password) 
    2323 
    24 def send_mass_mail(datatuple, fail_silently=False, auth_user=EMAIL_HOST_USER, auth_password=EMAIL_HOST_PASSWORD): 
     24def send_mass_mail(datatuple, fail_silently=False, auth_user=settings.EMAIL_HOST_USER, auth_password=settings.EMAIL_HOST_PASSWORD): 
    2525    """ 
    2626    Given a datatuple of (subject, message, from_email, recipient_list), sends 
    …… 
    3131    """ 
    3232    try: 
    33         server = smtplib.SMTP(EMAIL_HOST) 
     33        server = smtplib.SMTP(settings.EMAIL_HOST) 
    3434        if auth_user and auth_password: 
    3535            server.login(auth_user, auth_password) 
    …… 
    4242        if not recipient_list: 
    4343            continue 
    44         from_email = from_email or DEFAULT_FROM_EMAIL 
     44        from_email = from_email or settings.DEFAULT_FROM_EMAIL 
    4545        msg = SafeMIMEText(message) 
    4646        msg['Subject'] = subject 
    …… 
    5454def mail_admins(subject, message, fail_silently=False): 
    5555    "Sends a message to the admins, as defined by the ADMINS setting." 
    56     from django.conf.settings import ADMINS, SERVER_EMAIL 
    57     send_mail(EMAIL_SUBJECT_PREFIX + subject, message, SERVER_EMAIL, [a[1] for a in ADMINS], fail_silently) 
     56    send_mail(settings.EMAIL_SUBJECT_PREFIX + subject, message, settings.SERVER_EMAIL, [a[1] for a in settings.ADMINS], fail_silently) 
    5857 
    5958def mail_managers(subject, message, fail_silently=False): 
    6059    "Sends a message to the managers, as defined by the MANAGERS setting." 
    61     from django.conf.settings import MANAGERS, SERVER_EMAIL 
    62     send_mail(EMAIL_SUBJECT_PREFIX + subject, message, SERVER_EMAIL, [a[1] for a in MANAGERS], fail_silently) 
     60    send_mail(settings.EMAIL_SUBJECT_PREFIX + subject, message, settings.SERVER_EMAIL, [a[1] for a in settings.MANAGERS], fail_silently)