4 files changed, 1 insertions, 25 deletions
diff --git a/mediagoblin/_compat.py b/mediagoblin/_compat.py
deleted file mode 100644
index 09270ab4..00000000
--- a/mediagoblin/_compat.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import functools
-import warnings
-
-from email.mime.text import MIMEText
-
-
-def encode_to_utf8(method):
-    def wrapper(self):
-        return method(self)
-    functools.update_wrapper(wrapper, method, ['__name__', '__doc__'])
-    return wrapper
-
-
-# based on django.utils.encoding.python_2_unicode_compatible
-def py2_unicode(klass):
-    return klass
diff --git a/mediagoblin/tests/test_submission.py b/mediagoblin/tests/test_submission.py
index c9df1c21..2f5a2712 100644
--- a/mediagoblin/tests/test_submission.py
+++ b/mediagoblin/tests/test_submission.py
@@ -31,11 +31,6 @@ except ImportError:
     SKIP_AUDIO = True
     SKIP_VIDEO = True
 
-try:
-    import scikits.audiolab
-except ImportError:
-    SKIP_AUDIO = True
-
 import os
 import pytest
 import webtest.forms
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