mirror/django-mailbox
1
0
Fork 1
mirror of https://github.com/coddingtonbear/django-mailbox.git synced 2026-07-10 06:48:19 +02:00
Code Activity

Clean up EmailMessageTestCase._get_email_as_text

Browse source
This commit is contained in:
Adam Dobrawy 2016-04-06 07:36:18 +02:00
parent 71fcaa2ede
commit 3d84acf113
2 changed files with 6 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

32
django_mailbox/tests/base.py
View file

@ -1,9 +1,8 @@
import email import email
import os.path import os
from os.path import dirname, join
import time import time
import six
from django.conf import settings from django.conf import settings
from django.test import TestCase from django.test import TestCase
@ -16,14 +15,7 @@ class EmailIntegrationTimeout(Exception):
def get_email_as_text(name): def get_email_as_text(name):
with open( with open(join(dirname(__file__), 'messages', name), 'rb') as f:
os.path.join(
os.path.dirname(__file__),
'messages',
name,
),
'rb'
) as f:
return f.read() return f.read()
@ -65,23 +57,9 @@ class EmailMessageTestCase(TestCase):
return messages return messages
time.sleep(5) time.sleep(5)
def _get_email_as_text(self, name):
with open(
os.path.join(
os.path.dirname(__file__),
'messages',
name,
),
'rb'
) as f:
return f.read()
def _get_email_object(self, name): def _get_email_object(self, name):
copy = self._get_email_as_text(name) with open(join(dirname(__file__), 'messages', name), 'rb') as f:
if six.PY3: return email.message_from_files(f)
return email.message_from_bytes(copy)
else:
return email.message_from_string(copy)
def _headers_identical(self, left, right, header=None): def _headers_identical(self, left, right, header=None):
""" Check if headers are (close enough to) identical. """ Check if headers are (close enough to) identical.

2
django_mailbox/tests/test_transports.py
View file

@ -148,7 +148,7 @@ class TestPop3Transport(EmailMessageTestCase):
'+OK message follows', '+OK message follows',
[ [
line.encode('ascii') line.encode('ascii')
for line in self._get_email_as_text( for line in get_email_as_text(
'generic_message.eml' 'generic_message.eml'
).decode('ascii').split('\n') ).decode('ascii').split('\n')
], ],