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

Use urljoin to build api endpoint

Browse Source 
(String arithmetic was probably OK
for our limited use case, but in general
is a bad idea for constructing urls.)
This commit is contained in:
medmunds
2015-12-02 14:21:53 -08:00
parent fe1e2d1ae5
commit 5c39e40ea1
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,10 @@ from base64 import b64encode
from datetime import date, datetime from datetime import date, datetime
from email.mime.base import MIMEBase from email.mime.base import MIMEBase
from email.utils import parseaddr from email.utils import parseaddr
try:
from urlparse import urljoin # python 2
except ImportError:
from urllib.parse import urljoin # python 3
from django.conf import settings from django.conf import settings
from django.core.exceptions import ImproperlyConfigured from django.core.exceptions import ImproperlyConfigured
@@ -28,6 +32,9 @@ 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 = getattr(settings, "MANDRILL_API_URL", "https://mandrillapp.com/api/1.0") self.api_url = getattr(settings, "MANDRILL_API_URL", "https://mandrillapp.com/api/1.0")
if not self.api_url.endswith("/"):
self.api_url += "/"
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", {}):
@@ -162,9 +169,10 @@ class DjrillBackend(BaseEmailBackend):
Override this to substitute your own logic for determining API endpoint. Override this to substitute your own logic for determining API endpoint.
""" """
if 'template_name' in payload: if 'template_name' in payload:
return self.api_url + "/messages/send-template.json" api_method = "messages/send-template.json"
else: else:
return self.api_url + "/messages/send.json" api_method = "messages/send.json"
return urljoin(self.api_url, api_method)
def serialize_payload(self, payload, message): def serialize_payload(self, payload, message):
"""Return payload serialized to a json str. """Return payload serialized to a json str.