Moved to using e-mail backends (external apps will be updated to use …

…django.core.send_mail too)
adieu · Sep 10, 2010 · b0349f6 · b0349f6
1 parent 48cf5b4
commit b0349f6
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 26 deletions.
diff --git a/pinax/apps/account/forms.py b/pinax/apps/account/forms.py
@@ -2,6 +2,7 @@
 
 from django import forms
 from django.conf import settings
+from django.core.mail import send_mail
 from django.template.loader import render_to_string
 from django.utils.translation import ugettext_lazy as _, ugettext
 from django.utils.encoding import smart_unicode
@@ -14,9 +15,6 @@
 from django.contrib.auth.tokens import default_token_generator
 from django.contrib.sites.models import Site
 
-from pinax.core.utils import get_send_mail
-send_mail = get_send_mail()
-
 from emailconfirmation.models import EmailAddress
 from timezones.forms import TimeZoneField
 
@@ -413,7 +411,7 @@ def save(self, **kwargs):
                 "temp_key": temp_key,
                 "domain": domain,
             })
-            send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, [user.email], priority="high")
+            send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, [user.email])
         return self.cleaned_data["email"]
 
 

diff --git a/pinax/apps/signup_codes/forms.py b/pinax/apps/signup_codes/forms.py
@@ -2,15 +2,13 @@
 
 from django import forms
 from django.conf import settings
+from django.core.mail import send_mail
 from django.template.loader import render_to_string
 from django.utils.hashcompat import sha_constructor
 from django.utils.translation import ugettext_lazy as _, ugettext
 
 from django.contrib.sites.models import Site
 
-from pinax.core.utils import get_send_mail
-send_mail = get_send_mail()
-
 from pinax.apps.account.forms import GroupForm, SignupForm as BaseSignupForm
 from pinax.apps.signup_codes.models import SignupCode, check_signup_code
 
@@ -62,4 +60,4 @@ def send_signup_code(self):
         }
         subject = render_to_string("signup_codes/invite_user_subject.txt", ctx)
         message = render_to_string("signup_codes/invite_user.txt", ctx)
-        send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, [email], priority="high")
+        send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, [email])
diff --git a/pinax/core/utils.py b/pinax/core/utils.py
diff --git a/pinax/projects/account_project/settings.py b/pinax/projects/account_project/settings.py
@@ -162,6 +162,8 @@
 
 MESSAGE_STORAGE = "django.contrib.messages.storage.session.SessionStorage"
 
+EMAIL_BACKEND = "mailer.backend.DbBackend"
+
 ACCOUNT_OPEN_SIGNUP = True
 ACCOUNT_REQUIRED_EMAIL = False
 ACCOUNT_EMAIL_VERIFICATION = False

diff --git a/pinax/projects/basic_project/settings.py b/pinax/projects/basic_project/settings.py
@@ -172,6 +172,8 @@
 
 MESSAGE_STORAGE = "django.contrib.messages.storage.session.SessionStorage"
 
+EMAIL_BACKEND = "mailer.backend.DbBackend"
+
 ABSOLUTE_URL_OVERRIDES = {
     "auth.user": lambda o: "/profiles/profile/%s/" % o.username,
 }

diff --git a/pinax/projects/cms_company_project/settings.py b/pinax/projects/cms_company_project/settings.py
@@ -175,6 +175,8 @@
 
 MESSAGE_STORAGE = "django.contrib.messages.storage.session.SessionStorage"
 
+EMAIL_BACKEND = "mailer.backend.DbBackend"
+
 ABSOLUTE_URL_OVERRIDES = {
     "auth.user": lambda o: "/profiles/profile/%s/" % o.username,
 }

diff --git a/pinax/projects/cms_holidayhouse_project/settings.py b/pinax/projects/cms_holidayhouse_project/settings.py
@@ -175,6 +175,8 @@
 
 MESSAGE_STORAGE = "django.contrib.messages.storage.session.SessionStorage"
 
+EMAIL_BACKEND = "mailer.backend.DbBackend"
+
 ABSOLUTE_URL_OVERRIDES = {
     "auth.user": lambda o: "/profiles/profile/%s/" % o.username,
 }

diff --git a/pinax/projects/code_project/settings.py b/pinax/projects/code_project/settings.py
@@ -193,6 +193,8 @@
 
 MESSAGE_STORAGE = "django.contrib.messages.storage.session.SessionStorage"
 
+EMAIL_BACKEND = "mailer.backend.DbBackend"
+
 ABSOLUTE_URL_OVERRIDES = {
     "auth.user": lambda o: "/profiles/profile/%s/" % o.username,
 }

diff --git a/pinax/projects/company_project/settings.py b/pinax/projects/company_project/settings.py
@@ -150,6 +150,8 @@
 
 MESSAGE_STORAGE = "django.contrib.messages.storage.session.SessionStorage"
 
+EMAIL_BACKEND = "mailer.backend.DbBackend"
+
 DEBUG_TOOLBAR_CONFIG = {
     "INTERCEPT_REDIRECTS": False,
 }

diff --git a/pinax/projects/intranet_project/settings.py b/pinax/projects/intranet_project/settings.py
@@ -188,6 +188,8 @@
 
 MESSAGE_STORAGE = "django.contrib.messages.storage.session.SessionStorage"
 
+EMAIL_BACKEND = "mailer.backend.DbBackend"
+
 ABSOLUTE_URL_OVERRIDES = {
     "auth.user": lambda o: "/profiles/profile/%s/" % o.username,
 }

diff --git a/pinax/projects/private_beta_project/settings.py b/pinax/projects/private_beta_project/settings.py
@@ -164,6 +164,8 @@
 
 MESSAGE_STORAGE = "django.contrib.messages.storage.session.SessionStorage"
 
+EMAIL_BACKEND = "mailer.backend.DbBackend"
+
 ACCOUNT_OPEN_SIGNUP = False
 ACCOUNT_REQUIRED_EMAIL = False
 ACCOUNT_EMAIL_VERIFICATION = False
@@ -177,7 +179,6 @@
 LOGIN_URL = "/account/login/"
 LOGIN_REDIRECT_URLNAME = "what_next"
 
-
 EMAIL_CONFIRMATION_DAYS = 2
 EMAIL_DEBUG = DEBUG
 

diff --git a/pinax/projects/sample_group_project/settings.py b/pinax/projects/sample_group_project/settings.py
@@ -195,6 +195,8 @@
 
 MESSAGE_STORAGE = "django.contrib.messages.storage.session.SessionStorage"
 
+EMAIL_BACKEND = "mailer.backend.DbBackend"
+
 ABSOLUTE_URL_OVERRIDES = {
     "auth.user": lambda o: "/profiles/profile/%s/" % o.username,
 }

diff --git a/pinax/projects/social_project/settings.py b/pinax/projects/social_project/settings.py
@@ -209,6 +209,8 @@
 
 MESSAGE_STORAGE = "django.contrib.messages.storage.session.SessionStorage"
 
+EMAIL_BACKEND = "mailer.backend.DbBackend"
+
 ABSOLUTE_URL_OVERRIDES = {
     "auth.user": lambda o: "/profiles/profile/%s/" % o.username,
 }

diff --git a/pinax/projects/zero_project/settings.py b/pinax/projects/zero_project/settings.py
@@ -149,6 +149,8 @@
 
 MESSAGE_STORAGE = "django.contrib.messages.storage.session.SessionStorage"
 
+EMAIL_BACKEND = "mailer.backend.DbBackend"
+
 DEBUG_TOOLBAR_CONFIG = {
     "INTERCEPT_REDIRECTS": False,
 }