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

Tests: switch to explicit u"unicode" literals

Browse Source 
Drop `from __future__ import unicode_literals`;
it was there for Python 3.2 compatibility (which
Anymail doesn't support). Ensures tests use normal
strs in Python 2.x.
This commit is contained in:
medmunds
2016-10-13 14:37:08 -07:00
parent ac3c1cbf1a
commit 771ed513b2
10 changed files with 9 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/test_mailgun_backend.py
View File

@@ -1,7 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import unicode_literals
from datetime import date, datetime from datetime import date, datetime
from email.mime.base import MIMEBase from email.mime.base import MIMEBase
from email.mime.image import MIMEImage from email.mime.image import MIMEImage
@@ -145,9 +143,7 @@ class MailgunBackendStandardEmailTests(MailgunBackendMockAPITestCase):
self.assertEqual(len(inlines), 0) self.assertEqual(len(inlines), 0)
def test_unicode_attachment_correctly_decoded(self): def test_unicode_attachment_correctly_decoded(self):
# Slight modification from the Django unicode docs: self.message.attach(u"Une pièce jointe.html", u'<p>\u2019</p>', mimetype='text/html')
# https://django.readthedocs.io/en/latest/ref/unicode.html#email
self.message.attach("Une pièce jointe.html", '<p>\u2019</p>', mimetype='text/html')
self.message.send() self.message.send()
files = self.get_api_call_files() files = self.get_api_call_files()
attachments = [value for (field, value) in files if field == 'attachment'] attachments = [value for (field, value) in files if field == 'attachment']

2
tests/test_mailgun_integration.py
View File

@@ -1,5 +1,3 @@
from __future__ import unicode_literals
import os import os
import logging import logging
import unittest import unittest

6
tests/test_mandrill_backend.py
View File

@@ -1,7 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import unicode_literals
from datetime import date, datetime from datetime import date, datetime
from decimal import Decimal from decimal import Decimal
from email.mime.base import MIMEBase from email.mime.base import MIMEBase
@@ -171,9 +169,7 @@ class MandrillBackendStandardEmailTests(MandrillBackendMockAPITestCase):
self.assertFalse('images' in data['message']) self.assertFalse('images' in data['message'])
def test_unicode_attachment_correctly_decoded(self): def test_unicode_attachment_correctly_decoded(self):
# Slight modification from the Django unicode docs: self.message.attach(u"Une pièce jointe.html", u'<p>\u2019</p>', mimetype='text/html')
# https://django.readthedocs.io/en/latest/ref/unicode.html#email
self.message.attach("Une pièce jointe.html", '<p>\u2019</p>', mimetype='text/html')
self.message.send() self.message.send()
data = self.get_api_call_json() data = self.get_api_call_json()
attachments = data['message']['attachments'] attachments = data['message']['attachments']

2
tests/test_mandrill_integration.py
View File

@@ -1,5 +1,3 @@
from __future__ import unicode_literals
import os import os
import unittest import unittest

10
tests/test_postmark_backend.py
View File

@@ -1,7 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import unicode_literals
from base64 import b64encode from base64 import b64encode
from decimal import Decimal from decimal import Decimal
from email.mime.base import MIMEBase from email.mime.base import MIMEBase
@@ -172,15 +170,13 @@ class PostmarkBackendStandardEmailTests(PostmarkBackendMockAPITestCase):
self.assertNotIn('ContentID', attachments[2]) self.assertNotIn('ContentID', attachments[2])
def test_unicode_attachment_correctly_decoded(self): def test_unicode_attachment_correctly_decoded(self):
# Slight modification from the Django unicode docs: self.message.attach(u"Une pièce jointe.html", u'<p>\u2019</p>', mimetype='text/html')
# https://django.readthedocs.io/en/latest/ref/unicode.html#email
self.message.attach("Une pièce jointe.html", '<p>\u2019</p>', mimetype='text/html')
self.message.send() self.message.send()
data = self.get_api_call_json() data = self.get_api_call_json()
self.assertEqual(data['Attachments'], [{ self.assertEqual(data['Attachments'], [{
'Name': 'Une pièce jointe.html', 'Name': u'Une pièce jointe.html',
'ContentType': 'text/html', 'ContentType': 'text/html',
'Content': b64encode('<p>\u2019</p>'.encode('utf-8')).decode('ascii') 'Content': b64encode(u'<p>\u2019</p>'.encode('utf-8')).decode('ascii')
}]) }])
def test_embedded_images(self): def test_embedded_images(self):

2
tests/test_postmark_integration.py
View File

@@ -1,5 +1,3 @@
from __future__ import unicode_literals
import unittest import unittest
from django.test import SimpleTestCase from django.test import SimpleTestCase

10
tests/test_sendgrid_backend.py
View File

@@ -1,7 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import unicode_literals
import json import json
from calendar import timegm from calendar import timegm
from datetime import date, datetime from datetime import date, datetime
@@ -220,13 +218,11 @@ class SendGridBackendStandardEmailTests(SendGridBackendMockAPITestCase):
self.message.send() self.message.send()
def test_unicode_attachment_correctly_decoded(self): def test_unicode_attachment_correctly_decoded(self):
# Slight modification from the Django unicode docs: self.message.attach(u"Une pièce jointe.html", u'<p>\u2019</p>', mimetype='text/html')
# https://django.readthedocs.io/en/latest/ref/unicode.html#email
self.message.attach("Une pièce jointe.html", '<p>\u2019</p>', mimetype='text/html')
self.message.send() self.message.send()
files = self.get_api_call_files() files = self.get_api_call_files()
self.assertEqual(files['files[Une pièce jointe.html]'], self.assertEqual(files[u'files[Une pièce jointe.html]'],
('Une pièce jointe.html', '<p>\u2019</p>', 'text/html')) (u'Une pièce jointe.html', u'<p>\u2019</p>', 'text/html'))
def test_embedded_images(self): def test_embedded_images(self):
image_filename = SAMPLE_IMAGE_FILENAME image_filename = SAMPLE_IMAGE_FILENAME

2
tests/test_sendgrid_integration.py
View File

@@ -1,5 +1,3 @@
from __future__ import unicode_literals
import os import os
import unittest import unittest
from datetime import datetime, timedelta from datetime import datetime, timedelta

2
tests/test_sparkpost_backend.py
View File

@@ -210,7 +210,7 @@ class SparkPostBackendStandardEmailTests(SparkPostBackendMockAPITestCase):
def test_unicode_attachment_correctly_decoded(self): def test_unicode_attachment_correctly_decoded(self):
# Slight modification from the Django unicode docs: # Slight modification from the Django unicode docs:
# http://django.readthedocs.org/en/latest/ref/unicode.html#email # http://django.readthedocs.org/en/latest/ref/unicode.html#email
self.message.attach("Une pièce jointe.html", '<p>\u2019</p>', mimetype='text/html') self.message.attach(u"Une pièce jointe.html", u'<p>\u2019</p>', mimetype='text/html')
self.message.send() self.message.send()
params = self.get_send_params() params = self.get_send_params()
attachments = params['attachments'] attachments = params['attachments']

2
tests/test_sparkpost_integration.py
View File

@@ -1,5 +1,3 @@
from __future__ import unicode_literals
import os import os
import unittest import unittest
from datetime import datetime, timedelta from datetime import datetime, timedelta