allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [allura] 05/16: [#8354] six-ify email mime imports
Date Tue, 10 Mar 2020 15:58:53 GMT
This is an automated email from the ASF dual-hosted git repository.

brondsem pushed a commit to branch db/8354
in repository https://gitbox.apache.org/repos/asf/allura.git

commit e11520ddcd01777d76c1ec3b0c2b426fa8fa0625
Author: Dave Brondsema <dave@brondsema.net>
AuthorDate: Fri Mar 6 14:55:16 2020 -0500

    [#8354] six-ify email mime imports
---
 Allura/allura/lib/mail_util.py                                 | 4 ++--
 Allura/allura/tests/test_mail_util.py                          | 4 ++--
 ForgeDiscussion/forgediscussion/tests/functional/test_forum.py | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Allura/allura/lib/mail_util.py b/Allura/allura/lib/mail_util.py
index cce61a9..bdde46c 100644
--- a/Allura/allura/lib/mail_util.py
+++ b/Allura/allura/lib/mail_util.py
@@ -21,8 +21,8 @@ import re
 import logging
 import smtplib
 import email.feedparser
-from email.MIMEMultipart import MIMEMultipart
-from email.MIMEText import MIMEText
+from six.moves.email_mime_multipart import MIMEMultipart
+from six.moves.email_mime_text import MIMEText
 from email import header
 
 import six
diff --git a/Allura/allura/tests/test_mail_util.py b/Allura/allura/tests/test_mail_util.py
index 4b3d21e..80ab989 100644
--- a/Allura/allura/tests/test_mail_util.py
+++ b/Allura/allura/tests/test_mail_util.py
@@ -20,8 +20,8 @@
 from __future__ import unicode_literals
 from __future__ import absolute_import
 import unittest
-from email.MIMEMultipart import MIMEMultipart
-from email.MIMEText import MIMEText
+from six.moves.email_mime_multipart import MIMEMultipart
+from six.moves.email_mime_text import MIMEText
 
 import mock
 from nose.tools import raises, assert_equal, assert_false, assert_true, assert_in
diff --git a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
index f4b59d6..900f190 100644
--- a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
@@ -22,9 +22,9 @@ from __future__ import absolute_import
 import mock
 import random
 import logging
-from email.mime.text import MIMEText
-from email.mime.image import MIMEImage
-from email.mime.multipart import MIMEMultipart
+from six.moves.email_mime_text import MIMEText
+from six.moves.email_mime_image import MIMEImage
+from six.moves.email_mime_multipart import MIMEMultipart
 
 import pkg_resources
 import pymongo


Mime
View raw message