From 530b9d170473d92426f9767ad78adb061f2f9fd8 Mon Sep 17 00:00:00 2001
From: Erik Stein <erik@classlibrary.net>
Date: Tue, 20 Apr 2021 15:48:57 +0200
Subject: [PATCH] Avoid using Django's six module.

---
 setup.py                                      | 1 +
 shared/utils/models/slugs.py                  | 2 +-
 shared/utils/templatetags/translation_tags.py | 3 ++-
 shared/utils/text.py                          | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index f009343..83c0db4 100644
--- a/setup.py
+++ b/setup.py
@@ -64,6 +64,7 @@ setup(
         'beautifulsoup4',
         'translitcodec',
         'django-dirtyfields',
+        'six',
     ],
     classifiers=[
         # 'Development Status :: 4 - Beta',
diff --git a/shared/utils/models/slugs.py b/shared/utils/models/slugs.py
index e9a5b0d..7ba6dad 100644
--- a/shared/utils/models/slugs.py
+++ b/shared/utils/models/slugs.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
+import six
 
 from django.conf import settings
 from django.core import validators
@@ -7,7 +8,6 @@ from django.db import models
 from django.db.models import fields as django_fields
 from django.db.models.signals import pre_save, post_save
 from django.dispatch import receiver
-from django.utils import six
 from django.utils.translation import ugettext_lazy as _
 
 from dirtyfields import DirtyFieldsMixin
diff --git a/shared/utils/templatetags/translation_tags.py b/shared/utils/templatetags/translation_tags.py
index e815054..50d16b0 100644
--- a/shared/utils/templatetags/translation_tags.py
+++ b/shared/utils/templatetags/translation_tags.py
@@ -1,7 +1,8 @@
+from urllib.parse import urlsplit, urlunsplit
+
 from django import template
 from django.urls.exceptions import NoReverseMatch
 from django.urls import reverse
-from django.utils.six.moves.urllib.parse import urlsplit, urlunsplit
 from django.utils.translation import override
 
 from ..translation import get_translation, get_translated_field
diff --git a/shared/utils/text.py b/shared/utils/text.py
index 392e783..d1c6b83 100644
--- a/shared/utils/text.py
+++ b/shared/utils/text.py
@@ -2,14 +2,14 @@
 from __future__ import unicode_literals
 
 import codecs
-import translitcodec  # provides 'translit/long', used by codecs.encode()
+import translitcodec  #  provides 'translit/long', used by codecs.encode()
 import re
+import six
 
 from django.conf import settings
 from django.utils.encoding import force_text, smart_text
 from django.utils.functional import keep_lazy_text
 from django.utils.html import mark_safe
-from django.utils import six
 from django.utils.text import slugify as django_slugify
 from django.utils.translation import ugettext_lazy