From commits-return-17170-apmail-allura-commits-archive=allura.apache.org@allura.apache.org Tue Mar 10 15:58:50 2020 Return-Path: X-Original-To: apmail-allura-commits-archive@www.apache.org Delivered-To: apmail-allura-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by minotaur.apache.org (Postfix) with SMTP id C751819EFE for ; Tue, 10 Mar 2020 15:58:49 +0000 (UTC) Received: (qmail 56719 invoked by uid 500); 10 Mar 2020 15:58:49 -0000 Delivered-To: apmail-allura-commits-archive@allura.apache.org Received: (qmail 56678 invoked by uid 500); 10 Mar 2020 15:58:49 -0000 Mailing-List: contact commits-help@allura.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@allura.apache.org Delivered-To: mailing list commits@allura.apache.org Received: (qmail 56540 invoked by uid 99); 10 Mar 2020 15:58:49 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Mar 2020 15:58:49 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id DE4BE8DACF; Tue, 10 Mar 2020 15:58:48 +0000 (UTC) Date: Tue, 10 Mar 2020 15:58:53 +0000 To: "commits@allura.apache.org" Subject: [allura] 05/16: [#8354] six-ify email mime imports MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: brondsem@apache.org In-Reply-To: <158385592838.4369.8528853790722396612@gitbox.apache.org> References: <158385592838.4369.8528853790722396612@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: allura X-Git-Refname: refs/heads/db/8354 X-Git-Reftype: branch X-Git-Rev: e11520ddcd01777d76c1ec3b0c2b426fa8fa0625 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20200310155848.DE4BE8DACF@gitbox.apache.org> 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 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