Remove remaining imports/calls to six not automatically removed by pyupgrade.

15 files changed, 20 insertions, 45 deletions

diff --git a/mediagoblin/tests/test_auth.py b/mediagoblin/tests/test_auth.py
index dafaa1e7..c5218050 100644
--- a/mediagoblin/tests/test_auth.py
+++ b/mediagoblin/tests/test_auth.py
@@ -17,9 +17,7 @@
 import pkg_resources
 import pytest
 
-import six
-
-import six.moves.urllib.parse as urlparse
+import urllib.parse as urlparse
 
 from mediagoblin import mg_globals
 from mediagoblin.db.models import User, LocalUser
diff --git a/mediagoblin/tests/test_basic_auth.py b/mediagoblin/tests/test_basic_auth.py
index f7553fe1..444bb1aa 100644
--- a/mediagoblin/tests/test_basic_auth.py
+++ b/mediagoblin/tests/test_basic_auth.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/>.
 
-import six.moves.urllib.parse as urlparse
+import urllib.parse as urlparse
 
 from mediagoblin.db.models import User, LocalUser
 from mediagoblin.plugins.basic_auth import tools as auth_tools
diff --git a/mediagoblin/tests/test_edit.py b/mediagoblin/tests/test_edit.py
index c2cee048..424796e8 100644
--- a/mediagoblin/tests/test_edit.py
+++ b/mediagoblin/tests/test_edit.py
@@ -14,8 +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/>.
 
-import six
-import six.moves.urllib.parse as urlparse
+import urllib.parse as urlparse
 import pytest
 
 from mediagoblin import mg_globals
@@ -206,7 +205,6 @@ class TestMetaDataEdit:
             context_data = context_data[key]
         return response, context_data
 
-    @pytest.mark.skipif(six.PY2, reason='Breaks in Python 2 but seems non-critical')
     def test_edit_metadata(self, test_app):
         media_entry = fixture_media_entry(uploader=self.user.id,
             state='processed')
diff --git a/mediagoblin/tests/test_ldap.py b/mediagoblin/tests/test_ldap.py
index 0af1b7f5..7d8f2f34 100644
--- a/mediagoblin/tests/test_ldap.py
+++ b/mediagoblin/tests/test_ldap.py
@@ -16,13 +16,12 @@
 
 import pkg_resources
 import pytest
-import six
 try:
     from unittest import mock
 except ImportError:
     import unittest.mock as mock
 
-import six.moves.urllib.parse as urlparse
+import urllib.parse as urlparse
 
 from mediagoblin import mg_globals
 from mediagoblin.db.base import Session
diff --git a/mediagoblin/tests/test_notifications.py b/mediagoblin/tests/test_notifications.py
index 2bdc4223..d19f2951 100644
--- a/mediagoblin/tests/test_notifications.py
+++ b/mediagoblin/tests/test_notifications.py
@@ -16,7 +16,7 @@
 
 import pytest
 
-import six.moves.urllib.parse as urlparse
+import urllib.parse as urlparse
 
 from mediagoblin.tools import template, mail
 
diff --git a/mediagoblin/tests/test_oauth1.py b/mediagoblin/tests/test_oauth1.py
index fc4a2b01..345b308e 100644
--- a/mediagoblin/tests/test_oauth1.py
+++ b/mediagoblin/tests/test_oauth1.py
@@ -16,7 +16,7 @@
 
 import pytest
 
-from six.moves.urllib.parse import parse_qs, urlparse
+from urllib.parse import parse_qs, urlparse
 
 from oauthlib.oauth1 import Client
 
diff --git a/mediagoblin/tests/test_openid.py b/mediagoblin/tests/test_openid.py
index a0d129a9..8af0894a 100644
--- a/mediagoblin/tests/test_openid.py
+++ b/mediagoblin/tests/test_openid.py
@@ -16,8 +16,7 @@
 
 import pkg_resources
 import pytest
-import six
-import six.moves.urllib.parse as urlparse
+import urllib.parse as urlparse
 try:
     from unittest import mock
 except ImportError:
diff --git a/mediagoblin/tests/test_persona.py b/mediagoblin/tests/test_persona.py
index 25f0ca1e..6e7ee419 100644
--- a/mediagoblin/tests/test_persona.py
+++ b/mediagoblin/tests/test_persona.py
@@ -16,13 +16,12 @@
 
 import pkg_resources
 import pytest
-import six
 try:
     from unittest import mock
 except ImportError:
     import unittest.mock as mock
 
-import six.moves.urllib.parse as urlparse
+import urllib.parse as urlparse
 
 pytest.importorskip("requests")
 
diff --git a/mediagoblin/tests/test_privileges.py b/mediagoblin/tests/test_privileges.py
index b7a9ff3b..ddf2449b 100644
--- a/mediagoblin/tests/test_privileges.py
+++ b/mediagoblin/tests/test_privileges.py
@@ -14,7 +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 pytest
 from datetime import date, timedelta
 from webtest import AppError
@@ -128,7 +127,7 @@ class TestPrivilegeFunctionality:
         #----------------------------------------------------------------------
         with pytest.raises(AppError) as excinfo:
             response = self.test_app.get('/submit/')
-        excinfo = str(excinfo) if six.PY2 else str(excinfo).encode('ascii')
+        excinfo = str(excinfo).encode('ascii')
         assert b'Bad response: 403 FORBIDDEN' in excinfo
 
 
@@ -136,7 +135,7 @@ class TestPrivilegeFunctionality:
             response = self.do_post({'upload_files':[('file',GOOD_JPG)],
                 'title':'Normal Upload 1'},
                 url='/submit/')
-        excinfo = str(excinfo) if six.PY2 else str(excinfo).encode('ascii')
+        excinfo = str(excinfo).encode('ascii')
         assert b'Bad response: 403 FORBIDDEN' in excinfo
 
         # Test that a user cannot comment without the commenter privilege
@@ -159,14 +158,14 @@ class TestPrivilegeFunctionality:
             response = self.test_app.post(
                 media_uri_id + 'comment/add/',
                 {'comment_content': 'Test comment #42'})
-        excinfo = str(excinfo) if six.PY2 else str(excinfo).encode('ascii')
+        excinfo = str(excinfo).encode('ascii')
         assert b'Bad response: 403 FORBIDDEN' in excinfo
 
         # Test that a user cannot report without the reporter privilege
         #----------------------------------------------------------------------
         with pytest.raises(AppError) as excinfo:
             response = self.test_app.get(media_uri_slug+"report/")
-        excinfo = str(excinfo) if six.PY2 else str(excinfo).encode('ascii')
+        excinfo = str(excinfo).encode('ascii')
         assert b'Bad response: 403 FORBIDDEN' in excinfo
 
         with pytest.raises(AppError) as excinfo:
@@ -174,7 +173,7 @@ class TestPrivilegeFunctionality:
                 {'report_reason':'Testing Reports #1',
                 'reporter_id':'3'},
                 url=(media_uri_slug+"report/"))
-        excinfo = str(excinfo) if six.PY2 else str(excinfo).encode('ascii')
+        excinfo = str(excinfo).encode('ascii')
         assert b'Bad response: 403 FORBIDDEN' in excinfo
 
         # Test that a user cannot access the moderation pages w/o moderator
@@ -182,27 +181,27 @@ class TestPrivilegeFunctionality:
         #----------------------------------------------------------------------
         with pytest.raises(AppError) as excinfo:
             response = self.test_app.get("/mod/users/")
-        excinfo = str(excinfo) if six.PY2 else str(excinfo).encode('ascii')
+        excinfo = str(excinfo).encode('ascii')
         assert b'Bad response: 403 FORBIDDEN' in excinfo
 
         with pytest.raises(AppError) as excinfo:
             response = self.test_app.get("/mod/reports/")
-        excinfo = str(excinfo) if six.PY2 else str(excinfo).encode('ascii')
+        excinfo = str(excinfo).encode('ascii')
         assert b'Bad response: 403 FORBIDDEN' in excinfo
 
         with pytest.raises(AppError) as excinfo:
             response = self.test_app.get("/mod/media/")
-        excinfo = str(excinfo) if six.PY2 else str(excinfo).encode('ascii')
+        excinfo = str(excinfo).encode('ascii')
         assert b'Bad response: 403 FORBIDDEN' in excinfo
 
         with pytest.raises(AppError) as excinfo:
             response = self.test_app.get("/mod/users/1/")
-        excinfo = str(excinfo) if six.PY2 else str(excinfo).encode('ascii')
+        excinfo = str(excinfo).encode('ascii')
         assert b'Bad response: 403 FORBIDDEN' in excinfo
 
         with pytest.raises(AppError) as excinfo:
             response = self.test_app.get("/mod/reports/1/")
-        excinfo = str(excinfo) if six.PY2 else str(excinfo).encode('ascii')
+        excinfo = str(excinfo).encode('ascii')
         assert b'Bad response: 403 FORBIDDEN' in excinfo
 
         self.query_for_users()
@@ -213,5 +212,5 @@ class TestPrivilegeFunctionality:
                 'targeted_user':self.admin_user.id},
                 url='/mod/reports/1/')
             self.query_for_users()
-        excinfo = str(excinfo) if six.PY2 else str(excinfo).encode('ascii')
+        excinfo = str(excinfo).encode('ascii')
         assert b'Bad response: 403 FORBIDDEN' in excinfo
diff --git a/mediagoblin/tests/test_reporting.py b/mediagoblin/tests/test_reporting.py
index a59ea28e..81dc1d89 100644
--- a/mediagoblin/tests/test_reporting.py
+++ b/mediagoblin/tests/test_reporting.py
@@ -15,8 +15,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import pytest
-import six
-
 from mediagoblin.tools import template
 from mediagoblin.tests.tools import (fixture_add_user, fixture_media_entry,
         fixture_add_comment, fixture_add_comment_report)
diff --git a/mediagoblin/tests/test_sql_migrations.py b/mediagoblin/tests/test_sql_migrations.py
index 9bc9d8c4..bf7924b1 100644
--- a/mediagoblin/tests/test_sql_migrations.py
+++ b/mediagoblin/tests/test_sql_migrations.py
@@ -14,7 +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 pytest
 
 pytest.importorskip("migrate")
@@ -569,7 +568,6 @@ def _get_level3_exits(session, level):
          session.query(LevelExit3).filter_by(from_level=level.id)}
 
 
-@pytest.mark.skipif(six.PY2, reason='Breaks in Python 2 but migrations seem to run ok')
 def test_set1_to_set3():
     # Create / connect to database
     # ----------------------------
diff --git a/mediagoblin/tests/test_storage.py b/mediagoblin/tests/test_storage.py
index 4591cbdf..d72757b3 100644
--- a/mediagoblin/tests/test_storage.py
+++ b/mediagoblin/tests/test_storage.py
@@ -19,8 +19,6 @@ import os
 import tempfile
 
 import pytest
-import six
-
 from werkzeug.utils import secure_filename
 
 from mediagoblin import storage
diff --git a/mediagoblin/tests/test_submission.py b/mediagoblin/tests/test_submission.py
index 72faf1b9..c9df1c21 100644
--- a/mediagoblin/tests/test_submission.py
+++ b/mediagoblin/tests/test_submission.py
@@ -36,13 +36,6 @@ try:
 except ImportError:
     SKIP_AUDIO = True
 
-import six
-
-if six.PY2:  # this hack only work in Python 2
-    import sys
-    reload(sys)
-    sys.setdefaultencoding('utf-8')
-
 import os
 import pytest
 import webtest.forms
@@ -52,7 +45,7 @@ try:
 except ImportError:
     import unittest.mock as mock
 
-import six.moves.urllib.parse as urlparse
+import urllib.parse as urlparse
 
 from celery import Signature
 from mediagoblin.tests.tools import (
diff --git a/mediagoblin/tests/test_util.py b/mediagoblin/tests/test_util.py
index e1d2bdc1..851acf6e 100644
--- a/mediagoblin/tests/test_util.py
+++ b/mediagoblin/tests/test_util.py
@@ -24,8 +24,6 @@ import pytest
 import smtplib
 import pkg_resources
 
-import six
-
 from mediagoblin.tests.tools import get_app
 from mediagoblin import mg_globals
 from mediagoblin.tools import common, url, translate, mail, text, testing
diff --git a/mediagoblin/tests/tools.py b/mediagoblin/tests/tools.py
index 626ff323..82725059 100644
--- a/mediagoblin/tests/tools.py
+++ b/mediagoblin/tests/tools.py
@@ -19,8 +19,6 @@ import os
 import pkg_resources
 import shutil
 
-import six
-
 from paste.deploy import loadapp
 from webtest import TestApp