From 632334b4260284df1a689873802d2c1e802c1f16 Mon Sep 17 00:00:00 2001 From: medmunds Date: Mon, 30 Nov 2015 17:20:27 -0800 Subject: [PATCH] Don't access MANDRILL_API_URL setting at module level 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 --- djrill/__init__.py | 8 -------- djrill/mail/backends/djrill.py | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/djrill/__init__.py b/djrill/__init__.py index 6a49f82..f4520b6 100644 --- a/djrill/__init__.py +++ b/djrill/__init__.py @@ -1,10 +1,2 @@ -from django.conf import settings - from djrill.exceptions import MandrillAPIError, NotSupportedByMandrillError 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") diff --git a/djrill/mail/backends/djrill.py b/djrill/mail/backends/djrill.py index dd10038..58f6a90 100644 --- a/djrill/mail/backends/djrill.py +++ b/djrill/mail/backends/djrill.py @@ -5,7 +5,7 @@ from django.core.exceptions import ImproperlyConfigured from django.core.mail.backends.base import BaseEmailBackend 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 datetime import date, datetime @@ -47,7 +47,7 @@ class DjrillBackend(BaseEmailBackend): """ super(DjrillBackend, self).__init__(**kwargs) 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.global_settings = {} for setting_key in getattr(settings, "MANDRILL_SETTINGS", {}):