aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/tools
diff options
context:
space:
mode:
Diffstat (limited to 'mediagoblin/tools')
-rw-r--r--mediagoblin/tools/mail.py2
-rw-r--r--mediagoblin/tools/workbench.py3
2 files changed, 1 insertions, 4 deletions
diff --git a/mediagoblin/tools/mail.py b/mediagoblin/tools/mail.py
index 2a1bd6c3..ae416a04 100644
--- a/mediagoblin/tools/mail.py
+++ b/mediagoblin/tools/mail.py
@@ -15,12 +15,12 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from email.mime.text import MIMEText
import socket
import logging
import smtplib
import sys
from mediagoblin import mg_globals, messages
-from mediagoblin._compat import MIMEText
from mediagoblin.tools import common
### ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/mediagoblin/tools/workbench.py b/mediagoblin/tools/workbench.py
index ce295d7a..749466d6 100644
--- a/mediagoblin/tools/workbench.py
+++ b/mediagoblin/tools/workbench.py
@@ -18,13 +18,10 @@ import os
import shutil
import tempfile
-from mediagoblin._compat import py2_unicode
-
# Actual workbench stuff
# ----------------------
-@py2_unicode
class Workbench:
"""
Represent the directory for the workbench