\u2019
', mimetype='text/html') + self.message.attach(u"Une pièce jointe.html", u'\u2019
', mimetype='text/html') self.message.send() files = self.get_api_call_files() attachments = [value for (field, value) in files if field == 'attachment'] diff --git a/tests/test_mailgun_integration.py b/tests/test_mailgun_integration.py index 0207b33..0b3338f 100644 --- a/tests/test_mailgun_integration.py +++ b/tests/test_mailgun_integration.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os import logging import unittest diff --git a/tests/test_mandrill_backend.py b/tests/test_mandrill_backend.py index 4c7a711..7f11945 100644 --- a/tests/test_mandrill_backend.py +++ b/tests/test_mandrill_backend.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from datetime import date, datetime from decimal import Decimal from email.mime.base import MIMEBase @@ -171,9 +169,7 @@ class MandrillBackendStandardEmailTests(MandrillBackendMockAPITestCase): self.assertFalse('images' in data['message']) def test_unicode_attachment_correctly_decoded(self): - # Slight modification from the Django unicode docs: - # https://django.readthedocs.io/en/latest/ref/unicode.html#email - self.message.attach("Une pièce jointe.html", '\u2019
', mimetype='text/html') + self.message.attach(u"Une pièce jointe.html", u'\u2019
', mimetype='text/html') self.message.send() data = self.get_api_call_json() attachments = data['message']['attachments'] diff --git a/tests/test_mandrill_integration.py b/tests/test_mandrill_integration.py index f6d131b..ec57907 100644 --- a/tests/test_mandrill_integration.py +++ b/tests/test_mandrill_integration.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os import unittest diff --git a/tests/test_postmark_backend.py b/tests/test_postmark_backend.py index a556fa2..612ae34 100644 --- a/tests/test_postmark_backend.py +++ b/tests/test_postmark_backend.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from base64 import b64encode from decimal import Decimal from email.mime.base import MIMEBase @@ -172,15 +170,13 @@ class PostmarkBackendStandardEmailTests(PostmarkBackendMockAPITestCase): self.assertNotIn('ContentID', attachments[2]) def test_unicode_attachment_correctly_decoded(self): - # Slight modification from the Django unicode docs: - # https://django.readthedocs.io/en/latest/ref/unicode.html#email - self.message.attach("Une pièce jointe.html", '\u2019
', mimetype='text/html') + self.message.attach(u"Une pièce jointe.html", u'\u2019
', mimetype='text/html') self.message.send() data = self.get_api_call_json() self.assertEqual(data['Attachments'], [{ - 'Name': 'Une pièce jointe.html', + 'Name': u'Une pièce jointe.html', 'ContentType': 'text/html', - 'Content': b64encode('\u2019
'.encode('utf-8')).decode('ascii') + 'Content': b64encode(u'\u2019
'.encode('utf-8')).decode('ascii') }]) def test_embedded_images(self): diff --git a/tests/test_postmark_integration.py b/tests/test_postmark_integration.py index e575f95..871b566 100644 --- a/tests/test_postmark_integration.py +++ b/tests/test_postmark_integration.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import unittest from django.test import SimpleTestCase diff --git a/tests/test_sendgrid_backend.py b/tests/test_sendgrid_backend.py index f0b7765..42ffa89 100644 --- a/tests/test_sendgrid_backend.py +++ b/tests/test_sendgrid_backend.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - import json from calendar import timegm from datetime import date, datetime @@ -220,13 +218,11 @@ class SendGridBackendStandardEmailTests(SendGridBackendMockAPITestCase): self.message.send() def test_unicode_attachment_correctly_decoded(self): - # Slight modification from the Django unicode docs: - # https://django.readthedocs.io/en/latest/ref/unicode.html#email - self.message.attach("Une pièce jointe.html", '\u2019
', mimetype='text/html') + self.message.attach(u"Une pièce jointe.html", u'\u2019
', mimetype='text/html') self.message.send() files = self.get_api_call_files() - self.assertEqual(files['files[Une pièce jointe.html]'], - ('Une pièce jointe.html', '\u2019
', 'text/html')) + self.assertEqual(files[u'files[Une pièce jointe.html]'], + (u'Une pièce jointe.html', u'\u2019
', 'text/html')) def test_embedded_images(self): image_filename = SAMPLE_IMAGE_FILENAME diff --git a/tests/test_sendgrid_integration.py b/tests/test_sendgrid_integration.py index ce4f7de..43ee530 100644 --- a/tests/test_sendgrid_integration.py +++ b/tests/test_sendgrid_integration.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os import unittest from datetime import datetime, timedelta diff --git a/tests/test_sparkpost_backend.py b/tests/test_sparkpost_backend.py index 2333be1..624b7ee 100644 --- a/tests/test_sparkpost_backend.py +++ b/tests/test_sparkpost_backend.py @@ -210,7 +210,7 @@ class SparkPostBackendStandardEmailTests(SparkPostBackendMockAPITestCase): def test_unicode_attachment_correctly_decoded(self): # Slight modification from the Django unicode docs: # http://django.readthedocs.org/en/latest/ref/unicode.html#email - self.message.attach("Une pièce jointe.html", '\u2019
', mimetype='text/html') + self.message.attach(u"Une pièce jointe.html", u'\u2019
', mimetype='text/html') self.message.send() params = self.get_send_params() attachments = params['attachments'] diff --git a/tests/test_sparkpost_integration.py b/tests/test_sparkpost_integration.py index 74d9c30..1125ea5 100644 --- a/tests/test_sparkpost_integration.py +++ b/tests/test_sparkpost_integration.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os import unittest from datetime import datetime, timedelta