mirror of
https://github.com/pacnpal/django-anymail.git
synced 2025-12-20 11:51:05 -05:00
Add Djrill version to User-Agent header
(Makes version show up in Mandrill API logs)
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
|
||||||
from djrill.exceptions import MandrillAPIError, NotSupportedByMandrillError
|
from djrill.exceptions import MandrillAPIError, NotSupportedByMandrillError
|
||||||
from ._version import *
|
from ._version import __version__, VERSION
|
||||||
|
|
||||||
|
|
||||||
# This backend was developed against this API endpoint.
|
# This backend was developed against this API endpoint.
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
|
from __future__ import absolute_import
|
||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.core.exceptions import ImproperlyConfigured
|
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
|
||||||
|
|
||||||
# Oops: this file has the same name as our app, and cannot be renamed.
|
from djrill import MANDRILL_API_URL, MandrillAPIError, NotSupportedByMandrillError, __version__
|
||||||
#from djrill import MANDRILL_API_URL, MandrillAPIError, NotSupportedByMandrillError
|
from djrill.exceptions import removed_in_djrill_2
|
||||||
from ... import MANDRILL_API_URL, MandrillAPIError, NotSupportedByMandrillError
|
|
||||||
from ...exceptions import removed_in_djrill_2
|
|
||||||
|
|
||||||
from base64 import b64encode
|
from base64 import b64encode
|
||||||
from datetime import date, datetime
|
from datetime import date, datetime
|
||||||
@@ -83,6 +83,8 @@ class DjrillBackend(BaseEmailBackend):
|
|||||||
if not self.session:
|
if not self.session:
|
||||||
try:
|
try:
|
||||||
self.session = requests.Session()
|
self.session = requests.Session()
|
||||||
|
self.session.headers["User-Agent"] = "Djrill/%s %s" % (
|
||||||
|
__version__, self.session.headers.get("User-Agent", ""))
|
||||||
except:
|
except:
|
||||||
if not self.fail_silently:
|
if not self.fail_silently:
|
||||||
raise
|
raise
|
||||||
|
|||||||
Reference in New Issue
Block a user