Remove the need for six, as future.utils also provides these utils

Author: vdboor

docs/_ext/djangodummy/requirements.txt

@@ -8,4 +8,3 @@ django-polymorphic == 2.1.1
 django-tag-parser == 3.1
 sphinxcontrib-django == 0.4
 future == 0.17.1
-six == 1.12.0

fluent_contents/extensions/pluginpool.py

@@ -4,9 +4,9 @@
 """
 from threading import Lock
 
-import six
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ImproperlyConfigured
+from future.utils import string_types
 from fluent_utils.load import import_apps_submodule
 from future.builtins import str
 
@@ -152,7 +152,7 @@ def get_plugins_by_name(self, *names):
         self._import_plugins()
         plugin_instances = []
         for name in names:
-            if isinstance(name, six.string_types):
+            if isinstance(name, string_types):
                 try:
                     plugin_instances.append(self.plugins[name.lower()])
                 except KeyError:

fluent_contents/management/commands/find_contentitem_urls.py

@@ -5,8 +5,9 @@
 from django.core.management.base import BaseCommand
 from django.db import ProgrammingError, models
 from django.db.models import Q
-from django.utils import six, translation
+from django.utils import translation
 from django.utils.encoding import force_text
+from future.utils import text_type
 from html5lib import HTMLParser, treebuilders
 
 from fluent_contents.extensions import (
@@ -124,7 +125,7 @@ def inspect_model(self, model):
             for field in url_fields:
                 value = getattr(object, field.name)
                 if value:
-                    if isinstance(value, six.text_type):
+                    if isinstance(value, text_type):
                         value = force_text(value)
                     else:
                         value = value.to_db_value()  # AnyUrlValue

fluent_contents/models/managers.py

@@ -1,12 +1,12 @@
 """
 The manager classes are accessed via ``Placeholder.objects``.
 """
-import six
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 from django.utils.translation import get_language
 from future.builtins import str
+from future.utils import string_types
 from parler import appsettings as parler_appsettings
 from parler.utils import get_language_title
 from polymorphic.managers import PolymorphicManager
@@ -71,7 +71,7 @@ def translated(self, *language_codes):
             # Since some code operates on a True/str switch, make sure that doesn't drip into this low level code.
             for language_code in language_codes:
                 if not isinstance(
-                    language_code, six.string_types
+                    language_code, string_types
                 ) or language_code.lower() in ("1", "0", "true", "false"):
                     raise ValueError(
                         "ContentItemQuerySet.translated() expected language_code to be an ISO code"

fluent_contents/rendering/core.py

@@ -1,6 +1,5 @@
 import logging
 
-import six
 from django.conf import settings
 from django.core.cache import cache
 from django.db.models.query import EmptyQuerySet
@@ -9,6 +8,7 @@
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
 from future.builtins import str
+from future.utils import integer_types
 from parler.utils.context import smart_override
 
 from fluent_contents import appsettings
@@ -587,10 +587,10 @@ def _get_stale_item_class_name(item):
 def _min_timeout(val1, val2):
     # Avoid min(int, object). That may work but it's
     # a CPython implementation detail to compare that as "int" < "object"
-    if not isinstance(val2, six.integer_types):
+    if not isinstance(val2, integer_types):
         return val1
 
-    if not isinstance(val1, six.integer_types):
+    if not isinstance(val1, integer_types):
         return val2
 
     return min(val1, val2)

fluent_contents/rendering/utils.py

@@ -5,14 +5,14 @@
 import os
 
 import django
-import six
 from django.conf import settings
 from django.contrib.sites.models import Site
 from django.core.cache import cache
 from django.template.backends.django import Template as TemplateAdapter
 from django.template.loader import select_template
 from django.test import RequestFactory
 from django.utils.translation import get_language
+from future.utils import string_types
 
 from fluent_contents.extensions import ContentPlugin
 
@@ -109,7 +109,7 @@ def is_template_updated(request, contentitem, cachekey):
 
     if not template_names:
         return False
-    if isinstance(template_names, six.string_types):
+    if isinstance(template_names, string_types):
         template_names = [template_names]
 
     # With TEMPLATE_DEBUG = True, each node tracks it's origin.

fluent_contents/templatetags/fluent_contents_tags.py

@@ -23,7 +23,6 @@
 
 The CMS interface can scan for those tags using the :ref:`fluent_contents.analyzer` module.
 """
-import six
 from django.conf import settings
 from django.db.models import Manager
 from django.forms import Media
@@ -470,7 +469,7 @@ def _split_css(media, domain):
 
     needs_local = domain == "local"
     new_css = {}
-    for medium, url in six.iteritems(media._css):
+    for medium, url in media._css.items():
         if needs_local == _is_local(url):
             new_css.setdefault(medium, []).append(url)
 

fluent_contents/utils/search.py

@@ -1,9 +1,9 @@
 """
 Internal utils for search.
 """
-import six
 from django.utils.encoding import force_text
 from django.utils.html import strip_tags
+from future.utils import string_types
 
 
 def get_search_field_values(contentitem):
@@ -17,7 +17,7 @@ def get_search_field_values(contentitem):
 
         # Just assume all strings may contain HTML.
         # Not checking for just the PluginHtmlField here.
-        if value and isinstance(value, six.string_types):
+        if value and isinstance(value, string_types):
             value = get_cleaned_string(value)
 
         values.append(value)

setup.py

@@ -45,7 +45,6 @@ def find_version(*parts):
         "django-tag-parser>=3.2",
         "django-template-analyzer>=1.6.2",
         "future>=0.12.2",
-        "six>=1.5.2",
         # Work around https://github.com/html5lib/html5lib-python/issues/189
         "html5lib >= 0.999, != 0.9999, != 1.0b5, != 0.99999, != 1.0b6",
     ],