pacnpal/django-anymail
1
0
Fork 0
mirror of https://github.com/pacnpal/django-anymail.git synced 2025-12-20 20:01:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don't access MANDRILL_API_URL setting at module level

Browse Source 
Move MANDRILL_API_URL setting lookup into Djrill
backend init (where it's used).

Because "modules should not in general use settings
stored in django.conf.settings at the top level".
https://docs.djangoproject.com/en/dev/internals/contributing/writing-code/coding-style/#use-of-django-conf-settings
This commit is contained in:
medmunds
2015-11-30 17:20:27 -08:00
parent 3a6e0ebb30
commit 632334b426
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
djrill/__init__.py
View File

@@ -1,10 +1,2 @@
from django.conf import settings
from djrill.exceptions import MandrillAPIError, NotSupportedByMandrillError from djrill.exceptions import MandrillAPIError, NotSupportedByMandrillError
from ._version import __version__, VERSION from ._version import __version__, VERSION
# This backend was developed against this API endpoint.
# You can override in settings.py, if desired.
MANDRILL_API_URL = getattr(settings, "MANDRILL_API_URL",
"https://mandrillapp.com/api/1.0")

4
djrill/mail/backends/djrill.py
View File

@@ -5,7 +5,7 @@ from django.core.exceptions import ImproperlyConfigured
from django.core.mail.backends.base import BaseEmailBackend from django.core.mail.backends.base import BaseEmailBackend
from django.core.mail.message import sanitize_address, DEFAULT_ATTACHMENT_MIME_TYPE from django.core.mail.message import sanitize_address, DEFAULT_ATTACHMENT_MIME_TYPE
from djrill import MANDRILL_API_URL, MandrillAPIError, NotSupportedByMandrillError, __version__ from djrill import MandrillAPIError, NotSupportedByMandrillError, __version__
from base64 import b64encode from base64 import b64encode
from datetime import date, datetime from datetime import date, datetime
@@ -47,7 +47,7 @@ class DjrillBackend(BaseEmailBackend):
""" """
super(DjrillBackend, self).__init__(**kwargs) super(DjrillBackend, self).__init__(**kwargs)
self.api_key = getattr(settings, "MANDRILL_API_KEY", None) self.api_key = getattr(settings, "MANDRILL_API_KEY", None)
self.api_url = MANDRILL_API_URL self.api_url = getattr(settings, "MANDRILL_API_URL", "https://mandrillapp.com/api/1.0")
self.session = None self.session = None
self.global_settings = {} self.global_settings = {}
for setting_key in getattr(settings, "MANDRILL_SETTINGS", {}): for setting_key in getattr(settings, "MANDRILL_SETTINGS", {}):