Drop Python 2 support (credit @claudep)

Author: jpic

README

@@ -10,7 +10,7 @@
 Features
 --------
 
-- Python 2.7, 3.4, Django 2.0+ support (Django 1.11 (LTS), is supported until django-autocomplete-light-3.2.10),
+- Python 3.4, Django 3.2+ support,
 - Django (multiple) choice support,
 - Django (multiple) model choice support,
 - Django generic foreign key support (through django-querysetsequence),

setup.py

@@ -29,7 +29,6 @@ def read(fname):
     keywords='django autocomplete',
     install_requires=[
         'django>=3.2',
-        'six',
     ],
     extras_require={
         'nested': ['django-nested-admin>=3.0.21'],

src/dal/test/case.py

@@ -13,8 +13,6 @@
 
 import pytest
 
-import six
-
 
 @pytest.mark.usefixtures('cls_browser')
 class AutocompleteTestCase(StaticLiveServerTestCase):
@@ -85,7 +83,7 @@ class OptionMixin(object):
     @transaction.atomic
     def create_option(self):
         """Create a unique option from self.model into self.option."""
-        unique_name = six.text_type(uuid.uuid1())
+        unique_name = str(uuid.uuid1())
 
         if VERSION < (1, 10):
             # Support for the name to be changed through a popup in the admin.

src/dal/test/stories.py

@@ -7,8 +7,6 @@
     StaleElementReferenceException,
 )
 
-import six
-
 import tenacity
 
 
@@ -80,7 +78,7 @@ def get_label(self):
         )
 
         self.clean_label_from_remove_buton()
-        return self.clean_label(six.text_type(label.text))
+        return self.clean_label(label.text)
 
     def clean_label(self, label):
         """Given an option text, return the actual label."""
@@ -89,7 +87,7 @@ def clean_label(self, label):
     @tenacity.retry(stop=tenacity.stop_after_delay(3))
     def assert_label(self, text):
         """Assert that the autocomplete label matches text."""
-        assert six.text_type(text) == six.text_type(self.get_label())
+        assert text == self.get_label()
 
     def get_value(self):
         """Return the autocomplete field value."""
@@ -101,7 +99,7 @@ def get_value(self):
     @tenacity.retry(stop=tenacity.stop_after_delay(3))
     def assert_value(self, value):
         """Assart that the actual field value matches value."""
-        assert self.get_value() == six.text_type(value)
+        assert self.get_value() == str(value)
 
     def assert_selection(self, value, label):
         """Assert value is selected and has the given label."""
@@ -349,7 +347,7 @@ def get_labels(self):
         )
 
         return [
-            self.clean_label(six.text_type(label.text))
+            self.clean_label(label.text)
             for label in labels
         ]
 
@@ -374,8 +372,8 @@ def assert_labels(self, texts):
         self.case.assertEqual(len(texts), len(labels))
 
     def assert_values(self, values):
-        """Assart that the actual field values matches values."""
-        text_values = [six.text_type(v) for v in values]
+        """Assert that the actual field values matches values."""
+        text_values = [str(v) for v in values]
         actual_values = self.get_values()
 
         for actual_value in actual_values:

src/dal/views.py

@@ -18,8 +18,6 @@
 from django.template.loader import render_to_string
 from django.views.generic.list import BaseListView
 
-import six
-
 
 class ViewMixin(object):
     """Common methods for autocomplete views.
@@ -98,7 +96,7 @@ def get_result_label(self, result):
         if self.template:
             return render_to_string(self.template, {"result": result})
         else:
-            return six.text_type(result)
+            return result
 
     def get_selected_result_label(self, result):
         """Return the label of a selected result."""

src/dal/widgets.py

@@ -13,8 +13,6 @@
     from django.core.urlresolvers import reverse
 from django.utils.safestring import mark_safe
 
-import six
-
 
 class WidgetMixin(object):
     """Base mixin for autocomplete widgets.
@@ -69,15 +67,15 @@ def build_attrs(self, *args, **kwargs):
     def filter_choices_to_render(self, selected_choices):
         """Replace self.choices with selected_choices."""
         self.choices = [c for c in self.choices if
-                        six.text_type(c[0]) in selected_choices]
+                        str(c[0]) in selected_choices]
 
     @staticmethod
     def _make_forward_dict(f):
         """Convert forward declaration to a dictionary.
 
         A returned dictionary will be dumped to JSON while rendering widget.
         """
-        if isinstance(f, six.string_types):
+        if isinstance(f, str):
             return forward.Field(f).to_dict()
         elif isinstance(f, forward.Forward):
             return f.to_dict()
@@ -112,7 +110,7 @@ def render_options(self, *args):
         selected_choices_arg = 1 if VERSION < (1, 10) else 0
 
         # Filter out None values, not needed for autocomplete
-        selected_choices = [six.text_type(c) for c
+        selected_choices = [str(c) for c
                             in args[selected_choices_arg] if c]
 
         all_choices = copy.copy(self.choices)
@@ -135,7 +133,7 @@ def optgroups(self, name, value, attrs=None):
         Used by Django>=1.10.
         """
         # Filter out None values, not needed for autocomplete
-        selected_choices = [six.text_type(c) for c in value if c]
+        selected_choices = [str(c) for c in value if c]
         all_choices = copy.copy(self.choices)
         if self.url:
             self.filter_choices_to_render(selected_choices)

src/dal_contenttypes/fields.py

@@ -2,8 +2,6 @@
 
 from django.contrib.contenttypes.models import ContentType
 
-import six
-
 
 class ContentTypeModelFieldMixin(object):
     """
@@ -23,7 +21,7 @@ def prepare_value(self, value):
         if not value:
             return ''
 
-        if isinstance(value, six.string_types):
+        if isinstance(value, str):
             # Apparently Django's ModelChoiceField also expects two kinds of
             # "value" to be passed in this method.
             return value

src/dal_select2/views.py

@@ -14,8 +14,6 @@
 from django.utils.translation import gettext as _
 from django.views.generic.list import View
 
-import six
-
 
 class Select2ViewMixin(object):
     """View mixin to render a JSON response for Select2."""
@@ -204,8 +202,7 @@ def get_item_as_group(self, entry):
         group = None
         item = entry
 
-        if isinstance(entry, Sequence) and \
-           not isinstance(entry, six.string_types):
+        if isinstance(entry, Sequence) and not isinstance(entry, str):
 
             entry_length = len(entry)
 
@@ -222,8 +219,7 @@ def get_item_as_group(self, entry):
                 elif entry_length > 0:
                     item = entry[0]
 
-        if not isinstance(item, Sequence) or \
-           isinstance(item, six.string_types):
+        if not isinstance(item, Sequence) or isinstance(item, str):
             item = (item,)
 
         return (group, item),
@@ -265,7 +261,7 @@ def get(self, request, *args, **kwargs):
                                 {"id": x, "text": y} for x, y in l
                             ]
                         }
-                        for g, l in six.iteritems(results_dict)
+                        for g, l in results_dict.items()
                     ]
                 })
 
@@ -293,6 +289,6 @@ def get(self, request, *args, **kwargs):
                                 {"id": x, "text": x} for x in l
                             ]
                         }
-                        for g, l in six.iteritems(results_dict)
+                        for g, l in results_dict.items()
                     ]
                 })

src/dal_select2/widgets.py

@@ -27,8 +27,6 @@
 from django.utils import translation
 from django.utils.itercompat import is_iterable
 
-import six
-
 
 I18N_PATH = 'autocomplete_light/i18n/'
 
@@ -148,7 +146,7 @@ def value_from_datadict(self, data, files, name):
         and the model field expects a comma-separated list of tags.
         """
         values = super(TagSelect2, self).value_from_datadict(data, files, name)
-        return six.text_type(',').join(values)
+        return ','.join(values)
 
     def option_value(self, value):
         """Return the HTML option value attribute for a value."""
@@ -164,7 +162,7 @@ def format_value(self, value):
             if not v:
                 continue
 
-            v = v.split(',') if isinstance(v, six.string_types) else v
+            v = v.split(',') if isinstance(v, str) else v
             v = [v] if not is_iterable(v) else v
             for t in v:
                 values.add(self.option_value(t))
@@ -173,7 +171,7 @@ def format_value(self, value):
     def options(self, name, value, attrs=None):
         """Return only select options."""
         # When the data hasn't validated, we get the raw input
-        if isinstance(value, six.text_type):
+        if isinstance(value, str):
             value = value.split(',')
 
         for v in value:

src/dal_select2_queryset_sequence/views.py

@@ -11,8 +11,6 @@
 
 from queryset_sequence import QuerySetSequence
 
-import six
-
 
 class Select2QuerySetSequenceView(BaseQuerySetSequenceView, Select2ViewMixin):
     """
@@ -54,7 +52,7 @@ def get_results(self, context):
             'text': capfirst(self.get_model_name(model)),
             'children': [{
                 'id': self.get_result_value(result),
-                'text': six.text_type(result),
+                'text': str(result),
             } for result in results]
         } for model, results in groups.items()]
 

src/dal_select2_taggit/widgets.py

@@ -4,8 +4,6 @@
 
 from django import VERSION
 
-import six
-
 
 class TaggitSelect2(TagSelect2):
     """Select2 tag widget for taggit's TagField."""
@@ -42,7 +40,7 @@ def render_options(self, *args):
         selected_choices = args[selected_choices_arg]
 
         # When the data hasn't validated, we get the raw input here
-        if isinstance(selected_choices, six.text_type):
+        if isinstance(selected_choices, str):
             choices = [c.strip() for c in selected_choices.split(',')]
         else:
             # Filter out None values, not needed for autocomplete

test_project/custom_select2/models.py

@@ -1,9 +1,6 @@
 from django.db import models
 
-from six import python_2_unicode_compatible
 
-
-@python_2_unicode_compatible
 class TModel(models.Model):
     name = models.CharField(max_length=200)
 

test_project/forward_different_fields/models.py

@@ -1,9 +1,6 @@
 from django.db import models
 
-from six import python_2_unicode_compatible
 
-
-@python_2_unicode_compatible
 class TModel(models.Model):
     name = models.CharField(max_length=200)
 

test_project/linked_data/models.py

@@ -1,9 +1,6 @@
 from django.db import models
 
-from six import python_2_unicode_compatible
 
-
-@python_2_unicode_compatible
 class TModel(models.Model):
     name = models.CharField(max_length=200)
 

test_project/rename_forward/models.py

@@ -1,9 +1,6 @@
 from django.db import models
 
-from six import python_2_unicode_compatible
 
-
-@python_2_unicode_compatible
 class TModel(models.Model):
     name = models.CharField(max_length=200)
 

test_project/secure_data/models.py

@@ -1,9 +1,6 @@
 from django.db import models
 
-from six import python_2_unicode_compatible
 
-
-@python_2_unicode_compatible
 class TModel(models.Model):
     name = models.CharField(max_length=200)
 

test_project/select2_generic_foreign_key/models.py

@@ -1,10 +1,7 @@
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.db import models
 
-from six import python_2_unicode_compatible
 
-
-@python_2_unicode_compatible
 class TModel(models.Model):
     name = models.CharField(max_length=200)
 
@@ -54,7 +51,6 @@ def __str__(self):
         return self.name
 
 
-@python_2_unicode_compatible
 class TProxyModel(TModel):
     class Meta:
         proxy = True

test_project/select2_generic_foreign_key/test_forms.py

@@ -10,8 +10,6 @@
 
 from queryset_sequence import QuerySetSequence
 
-import six
-
 from .forms import TForm
 from .models import TModel, TProxyModel
 
@@ -84,7 +82,7 @@ def test_initial(self):
         # Ensure that the widget rendered right, with only the selection
         expected = forms.Select(
             choices=(
-                (self.get_value(relation), six.text_type(relation)),
+                (self.get_value(relation), str(relation)),
             ),
             attrs={
                 'data-autocomplete-light-function': 'select2',
@@ -93,7 +91,7 @@ def test_initial(self):
                 'id': 'id_test',
             }
         ).render('test', value=self.get_value(relation))
-        result = six.text_type(form['test'].as_widget())
+        result = str(form['test'].as_widget())
 
         expected += '''
         <div class="dal-forward-conf" id="dal-forward-conf-for_id_test"

test_project/select2_generic_m2m/models.py

@@ -2,10 +2,7 @@
 
 from genericm2m.models import RelatedObjectsDescriptor
 
-from six import python_2_unicode_compatible
 
-
-@python_2_unicode_compatible
 class TModel(models.Model):
     name = models.CharField(max_length=200)