From 8628c724ab3a4186c426d3ec31d7befb041ebe77 Mon Sep 17 00:00:00 2001 From: Kevin Chung Date: Sun, 18 Jun 2017 12:30:49 -0400 Subject: [PATCH] Rearranging some imports (#290) Fixes #289 --- CTFd/utils.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CTFd/utils.py b/CTFd/utils.py index 19e97649..77f5609d 100644 --- a/CTFd/utils.py +++ b/CTFd/utils.py @@ -1,5 +1,4 @@ import datetime -import email import functools import hashlib import json @@ -10,6 +9,7 @@ import os import re import requests import shutil +import six import smtplib import socket import subprocess @@ -21,11 +21,11 @@ import dataset import zipfile import io +from email.mime.text import MIMEText from flask import current_app as app, request, redirect, url_for, session, render_template, abort from flask_caching import Cache from flask_migrate import Migrate, upgrade as migrate_upgrade, stamp as migrate_stamp from itsdangerous import Signer -import six from six.moves.urllib.parse import urlparse, urljoin from werkzeug.utils import secure_filename @@ -474,7 +474,7 @@ def sendmail(addr, text): data['SSL'] = get_config('mail_ssl') smtp = get_smtp(**data) - msg = email.mime.text.MIMEText(text) + msg = MIMEText(text) msg['Subject'] = "Message from {0}".format(ctf_name) msg['From'] = mailfrom_addr msg['To'] = addr