From 8f9afdff7ea5c7beb1e6e04f5d877320585c8151 Mon Sep 17 00:00:00 2001
From: medmunds <medmunds@gmail.com>
Date: Fri, 11 Jan 2013 17:34:17 -0800
Subject: [PATCH] Move MANDRILL_API_URL to package root (out of backend)

---
 djrill/__init__.py             |  6 ++++++
 djrill/mail/backends/djrill.py | 10 +++-------
 djrill/views.py                |  4 ++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/djrill/__init__.py b/djrill/__init__.py
index f74604c..0b67a0d 100644
--- a/djrill/__init__.py
+++ b/djrill/__init__.py
@@ -1,9 +1,15 @@
+from django.conf import settings
 from django.contrib.admin.sites import AdminSite
 from django.utils.text import capfirst
 
 VERSION = (0, 2, 0)
 __version__ = '.'.join([str(x) for x in 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",
+    "http://mandrillapp.com/api/1.0")
+
 from exceptions import MandrillAPIError, NotSupportedByMandrillError
 
 class DjrillAdminSite(AdminSite):
diff --git a/djrill/mail/backends/djrill.py b/djrill/mail/backends/djrill.py
index 98466a3..b6436de 100644
--- a/djrill/mail/backends/djrill.py
+++ b/djrill/mail/backends/djrill.py
@@ -5,8 +5,8 @@ from django.core.mail.message import sanitize_address, DEFAULT_ATTACHMENT_MIME_T
 from django.utils import simplejson as json
 
 # Oops: this file has the same name as our app, and cannot be renamed.
-#from djrill import MandrillAPIError, NotSupportedByMandrillError
-from ... import MandrillAPIError, NotSupportedByMandrillError
+#from djrill import MANDRILL_API_URL, MandrillAPIError, NotSupportedByMandrillError
+from ... import MANDRILL_API_URL, MandrillAPIError, NotSupportedByMandrillError
 
 from base64 import b64encode
 from email.mime.base import MIMEBase
@@ -14,10 +14,6 @@ from email.utils import parseaddr
 import mimetypes
 import requests
 
-# This backend was developed against this API endpoint.
-# You can override in settings.py, if desired.
-MANDRILL_API_URL = "http://mandrillapp.com/api/1.0"
-
 DjrillBackendHTTPError = MandrillAPIError # Backwards-compat Djrill<=0.2.0
 
 class DjrillBackend(BaseEmailBackend):
@@ -31,7 +27,7 @@ class DjrillBackend(BaseEmailBackend):
         """
         super(DjrillBackend, self).__init__(**kwargs)
         self.api_key = getattr(settings, "MANDRILL_API_KEY", None)
-        self.api_url = getattr(settings, "MANDRILL_API_URL", MANDRILL_API_URL)
+        self.api_url = MANDRILL_API_URL
 
         if not self.api_key:
             raise ImproperlyConfigured("You have not set your mandrill api key "
diff --git a/djrill/views.py b/djrill/views.py
index 4f4c5da..23fee44 100644
--- a/djrill/views.py
+++ b/djrill/views.py
@@ -5,7 +5,7 @@ from django.core.exceptions import ImproperlyConfigured
 from django.utils import simplejson as json
 from django.views.generic import TemplateView
 
-from djrill.mail.backends.djrill import MANDRILL_API_URL
+from djrill import MANDRILL_API_URL
 
 import requests
 
@@ -25,7 +25,7 @@ class DjrillApiMixin(object):
     """
     def __init__(self):
         self.api_key = getattr(settings, "MANDRILL_API_KEY", None)
-        self.api_url = getattr(settings, "MANDRILL_API_URL", MANDRILL_API_URL)
+        self.api_url = MANDRILL_API_URL
 
         if not self.api_key:
             raise ImproperlyConfigured("You have not set your mandrill api key "