aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/tools
diff options
context:
space:
mode:
authorBen Sturmfels <ben@sturm.com.au>2021-03-05 23:52:13 +1100
committerBen Sturmfels <ben@sturm.com.au>2021-03-05 23:52:13 +1100
commitf0d57e3bd8bd93f87b85e15e823878ca0e7c760a (patch)
treec0ee61818bce25d6b63d48b475d5cc78e1152756 /mediagoblin/tools
parent9bf3bc1944b14252978a6aa2f963effab7208515 (diff)
downloadmediagoblin-f0d57e3bd8bd93f87b85e15e823878ca0e7c760a.tar.lz
mediagoblin-f0d57e3bd8bd93f87b85e15e823878ca0e7c760a.tar.xz
mediagoblin-f0d57e3bd8bd93f87b85e15e823878ca0e7c760a.zip
Remove remaining Python 2 compatibility code.
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