From f0d57e3bd8bd93f87b85e15e823878ca0e7c760a Mon Sep 17 00:00:00 2001
From: Ben Sturmfels <ben@sturm.com.au>
Date: Fri, 5 Mar 2021 23:52:13 +1100
Subject: Remove remaining Python 2 compatibility code.

---
 mediagoblin/tools/mail.py      | 2 +-
 mediagoblin/tools/workbench.py | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'mediagoblin/tools')

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
-- 
cgit v1.2.3