14 files changed, 5 insertions, 27 deletions
diff --git a/mediagoblin/tools/exif.py b/mediagoblin/tools/exif.py
index cf739b07..99285d67 100644
--- a/mediagoblin/tools/exif.py
+++ b/mediagoblin/tools/exif.py
@@ -14,8 +14,6 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import six
-
 from exifread import process_file
 from exifread.utils import Ratio
 
diff --git a/mediagoblin/tools/files.py b/mediagoblin/tools/files.py
index e2e07733..8da1758c 100644
--- a/mediagoblin/tools/files.py
+++ b/mediagoblin/tools/files.py
@@ -14,8 +14,6 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import six
-
 from mediagoblin import mg_globals
 
 
diff --git a/mediagoblin/tools/mail.py b/mediagoblin/tools/mail.py
index 3e46fb36..2a1bd6c3 100644
--- a/mediagoblin/tools/mail.py
+++ b/mediagoblin/tools/mail.py
@@ -17,7 +17,6 @@
 
 import socket
 import logging
-import six
 import smtplib
 import sys
 from mediagoblin import mg_globals, messages
diff --git a/mediagoblin/tools/pagination.py b/mediagoblin/tools/pagination.py
index 5e859a5f..51f31301 100644
--- a/mediagoblin/tools/pagination.py
+++ b/mediagoblin/tools/pagination.py
@@ -19,7 +19,7 @@ from math import ceil, floor
 from itertools import count
 from werkzeug.datastructures import MultiDict
 
-from six.moves import urllib
+import urllib
 
 PAGINATION_DEFAULT_PER_PAGE = 30
 
diff --git a/mediagoblin/tools/processing.py b/mediagoblin/tools/processing.py
index 5af3b5ad..aa086a30 100644
--- a/mediagoblin/tools/processing.py
+++ b/mediagoblin/tools/processing.py
@@ -18,7 +18,7 @@ import logging
 import json
 import traceback
 
-from six.moves.urllib import request, parse
+from urllib import request, parse
 
 _log = logging.getLogger(__name__)
 
diff --git a/mediagoblin/tools/request.py b/mediagoblin/tools/request.py
index 51403f05..f1cd01a7 100644
--- a/mediagoblin/tools/request.py
+++ b/mediagoblin/tools/request.py
@@ -17,7 +17,6 @@
 import json
 import logging
 
-import six
 from werkzeug.http import parse_options_header
 
 from mediagoblin.db.models import User, AccessToken
diff --git a/mediagoblin/tools/response.py b/mediagoblin/tools/response.py
index 93b9c6e7..eb9d4e6f 100644
--- a/mediagoblin/tools/response.py
+++ b/mediagoblin/tools/response.py
@@ -16,7 +16,6 @@
 
 import json
 
-import six
 import werkzeug.utils
 from werkzeug.wrappers import Response as wz_Response
 from mediagoblin.tools.template import render_template
diff --git a/mediagoblin/tools/routing.py b/mediagoblin/tools/routing.py
index 1c360bff..ebd2c08e 100644
--- a/mediagoblin/tools/routing.py
+++ b/mediagoblin/tools/routing.py
@@ -16,9 +16,7 @@
 
 import logging
 
-import six
-
-from six.moves.urllib.parse import urlparse
+from urllib.parse import urlparse
 from werkzeug.routing import Map, Rule
 
 from mediagoblin.tools.common import import_component
diff --git a/mediagoblin/tools/staticdirect.py b/mediagoblin/tools/staticdirect.py
index 545500bc..5a125576 100644
--- a/mediagoblin/tools/staticdirect.py
+++ b/mediagoblin/tools/staticdirect.py
@@ -24,8 +24,6 @@
 
 import logging
 
-import six
-
 _log = logging.getLogger(__name__)
 
 
diff --git a/mediagoblin/tools/template.py b/mediagoblin/tools/template.py
index 1a335fe4..a99e042a 100644
--- a/mediagoblin/tools/template.py
+++ b/mediagoblin/tools/template.py
@@ -14,8 +14,6 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import six
-
 import jinja2
 from jinja2.ext import Extension
 from jinja2.nodes import Include, Const
diff --git a/mediagoblin/tools/translate.py b/mediagoblin/tools/translate.py
index c383fce0..ce4cd4d3 100644
--- a/mediagoblin/tools/translate.py
+++ b/mediagoblin/tools/translate.py
@@ -17,8 +17,6 @@
 import gettext
 import pkg_resources
 
-import six
-
 from babel import localedata
 from babel.support import LazyProxy
 
@@ -147,10 +145,9 @@ def pass_to_ugettext(*args, **kwargs):
     The reason we can't have a global ugettext method is because
     mg_globals gets swapped out by the application per-request.
     """
-    if six.PY2:
-        return mg_globals.thread_scope.translations.ugettext(*args, **kwargs)
     return mg_globals.thread_scope.translations.gettext(*args, **kwargs)
 
+
 def pass_to_ungettext(*args, **kwargs):
     """
     Pass a translation on to the appropriate ungettext method.
@@ -158,8 +155,6 @@ def pass_to_ungettext(*args, **kwargs):
     The reason we can't have a global ugettext method is because
     mg_globals gets swapped out by the application per-request.
     """
-    if six.PY2:
-        return mg_globals.thread_scope.translations.ungettext(*args, **kwargs)
     return mg_globals.thread_scope.translations.ngettext(*args, **kwargs)
 
 
diff --git a/mediagoblin/tools/url.py b/mediagoblin/tools/url.py
index fbfeefae..b7f0f6aa 100644
--- a/mediagoblin/tools/url.py
+++ b/mediagoblin/tools/url.py
@@ -17,8 +17,6 @@
 import re
 from unidecode import unidecode
 
-import six
-
 _punct_re = re.compile(r'[\t !"#:$%&\'()*\-/<=>?@\[\\\]^_`{|},.]+')
 
 
diff --git a/mediagoblin/tools/validator.py b/mediagoblin/tools/validator.py
index 93296eab..0d5d94b5 100644
--- a/mediagoblin/tools/validator.py
+++ b/mediagoblin/tools/validator.py
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from six.moves.urllib.parse import urlparse
+from urllib.parse import urlparse
 
 def validate_email(email):
     """
diff --git a/mediagoblin/tools/workbench.py b/mediagoblin/tools/workbench.py
index bcc48640..ce295d7a 100644
--- a/mediagoblin/tools/workbench.py
+++ b/mediagoblin/tools/workbench.py
@@ -18,8 +18,6 @@ import os
 import shutil
 import tempfile
 
-import six
-
 from mediagoblin._compat import py2_unicode
 
 # Actual workbench stuff