X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=patchwork%2Ftests%2Futils.py;h=9abe2c7dbd4957ef90f32e846837d466cb33dc8e;hb=753fdc30f97f8a6557de69ee06adcf231eeafd44;hp=782ed369cca0254a80d20abd5a90b7a70c3f614d;hpb=ad2762cf775a8dde508de47164d6429f3fd724f1;p=patchwork diff --git a/patchwork/tests/utils.py b/patchwork/tests/utils.py index 782ed36..9abe2c7 100644 --- a/patchwork/tests/utils.py +++ b/patchwork/tests/utils.py @@ -24,13 +24,8 @@ from django.contrib.auth.models import User from django.forms.fields import EmailField from email import message_from_file -try: - from email.mime.text import MIMEText - from email.mime.multipart import MIMEMultipart -except ImportError: - # Python 2.4 compatibility - from email.MIMEText import MIMEText - from email.MIMEMultipart import MIMEMultipart +from email.mime.text import MIMEText +from email.mime.multipart import MIMEMultipart # helper functions for tests _test_mail_dir = os.path.join(os.path.dirname(__file__), 'mail')