From 9bf3bc1944b14252978a6aa2f963effab7208515 Mon Sep 17 00:00:00 2001
From: Ben Sturmfels <ben@sturm.com.au>
Date: Fri, 5 Mar 2021 23:42:38 +1100
Subject: Remove remaining imports/calls to six not automatically removed by
 pyupgrade.

---
 mediagoblin/db/base.py       | 5 ++---
 mediagoblin/db/migrations.py | 2 --
 mediagoblin/db/models.py     | 3 +--
 mediagoblin/db/open.py       | 1 -
 4 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'mediagoblin/db')

diff --git a/mediagoblin/db/base.py b/mediagoblin/db/base.py
index d2595ce2..deae2a01 100644
--- a/mediagoblin/db/base.py
+++ b/mediagoblin/db/base.py
@@ -13,7 +13,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 copy
 
 from sqlalchemy.ext.declarative import declarative_base
@@ -41,14 +40,14 @@ class FakeCursor:
         return FakeCursor(copy.copy(self.cursor), self.mapper, self.filter)
 
     def __iter__(self):
-        return six.moves.filter(self.filter, six.moves.map(self.mapper, self.cursor))
+        return filter(self.filter, map(self.mapper, self.cursor))
 
     def __getitem__(self, key):
         return self.mapper(self.cursor[key])
 
     def slice(self, *args, **kwargs):
         r = self.cursor.slice(*args, **kwargs)
-        return list(six.moves.filter(self.filter, six.moves.map(self.mapper, r)))
+        return list(filter(self.filter, map(self.mapper, r)))
 
 class GMGTableBase:
     # Deletion types
diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py
index e6a80310..6c5b027c 100644
--- a/mediagoblin/db/migrations.py
+++ b/mediagoblin/db/migrations.py
@@ -18,8 +18,6 @@
 import datetime
 import uuid
 
-import six
-
 try:
     import migrate
 except ImportError:
diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py
index 11d7b275..c5809185 100644
--- a/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@ -44,8 +44,7 @@ from mediagoblin.tools.common import import_component
 from mediagoblin.tools.routing import extract_url_arguments
 from mediagoblin.tools.text import convert_to_tag_list_of_dicts
 
-import six
-from six.moves.urllib.parse import urljoin
+from urllib.parse import urljoin
 from pytz import UTC
 
 _log = logging.getLogger(__name__)
diff --git a/mediagoblin/db/open.py b/mediagoblin/db/open.py
index 3252f175..6cdf2fbb 100644
--- a/mediagoblin/db/open.py
+++ b/mediagoblin/db/open.py
@@ -18,7 +18,6 @@
 from contextlib import contextmanager
 import logging
 
-import six
 from sqlalchemy import create_engine, event
 
 from mediagoblin import mg_globals
-- 
cgit v1.2.3