federico/django-mailbox
1
0
Fork 0
forked from mirror/django-mailbox
Code Activity

Modernize syntax, drop Python EOL, drop drop Django<1.11, upgrade TravisCI config to v1, add Python 3.8 & Django 3.x

Browse source
This commit is contained in:
Adam Dobrawy 2019-10-15 05:31:13 +02:00
parent f9b0a27e5f
commit 2b2b7d6392
43 changed files with 228 additions and 349 deletions
Download patch file Download diff file Expand all files Collapse all files

22
django_mailbox/tests/base.py
View file

@ -2,8 +2,6 @@ import email
import os.path
import time
import six
from django.conf import settings
from django.test import TestCase
@ -57,7 +55,7 @@ class EmailMessageTestCase(TestCase):
settings.EMAIL_HOST_USER = self.test_account
settings.EMAIL_HOST_PASSWORD = self.test_password
settings.EMAIL_USE_TLS = True
super(EmailMessageTestCase, self).setUp()
super().setUp()
def _get_new_messages(self, mailbox, condition=None):
start_time = time.time()
@ -70,8 +68,7 @@ class EmailMessageTestCase(TestCase):
# check if generator contains at least one element
message = next(messages)
yield message
for message in messages:
yield message
yield from messages
return
except StopIteration:
@ -92,10 +89,7 @@ class EmailMessageTestCase(TestCase):
def _get_email_object(self, name):
copy = self._get_email_as_text(name)
if six.PY3:
return email.message_from_bytes(copy)
else:
return email.message_from_string(copy)
return email.message_from_bytes(copy)
def _headers_identical(self, left, right, header=None):
""" Check if headers are (close enough to) identical.
@ -131,7 +125,7 @@ class EmailMessageTestCase(TestCase):
raise AssertionError("Extra header '%s'" % key)
if not self._headers_identical(right[key], value, header=key):
raise AssertionError(
"Header '%s' unequal:\n%s\n%s" % (
"Header '{}' unequal:\n{}\n{}".format(
key,
repr(value),
repr(right[key]),
@ -144,7 +138,7 @@ class EmailMessageTestCase(TestCase):
raise AssertionError("Extra header '%s'" % key)
if not self._headers_identical(left[key], value, header=key):
raise AssertionError(
"Header '%s' unequal:\n%s\n%s" % (
"Header '{}' unequal:\n{}\n{}".format(
key,
repr(value),
repr(right[key]),
@ -175,7 +169,7 @@ class EmailMessageTestCase(TestCase):
def _raise_mismatched(self, left, right):
raise AssertionError(
"Message payloads do not match:\n%s\n%s" % (
"Message payloads do not match:\n{}\n{}".format(
left.as_string(),
right.as_string()
)
@ -183,7 +177,7 @@ class EmailMessageTestCase(TestCase):
def assertEqual(self, left, right): # noqa: N802
if not isinstance(left, email.message.Message):
return super(EmailMessageTestCase, self).assertEqual(left, right)
return super().assertEqual(left, right)
return self.compare_email_objects(left, right)
def tearDown(self):
@ -194,4 +188,4 @@ class EmailMessageTestCase(TestCase):
models.TEXT_STORED_MIMETYPES = self._TEXT_STORED_MIMETYPES
self.mailbox.delete()
super(EmailMessageTestCase, self).tearDown()
super().tearDown()