Drop six

Author: Alexey Semashkevich

agnocomplete/core.py

@@ -2,7 +2,6 @@
 The different agnocomplete classes to be discovered
 """
 from copy import copy
-from six import with_metaclass
 from abc import abstractmethod, ABCMeta
 import logging
 
@@ -25,7 +24,7 @@
 logger = logging.getLogger(__name__)
 
 
-class ClassPropertyDescriptor(object):
+class ClassPropertyDescriptor:
     """
     Toolkit class used to instanciate a class property.
     """
@@ -114,7 +113,7 @@ def load_settings_sizes():
     )
 
 
-class AgnocompleteBase(with_metaclass(ABCMeta, object)):
+class AgnocompleteBase(metaclass=ABCMeta):
     """
     Base class for Agnocomplete tools.
     """
@@ -284,7 +283,7 @@ def selected(self, ids):
         return list(result)
 
 
-class AgnocompleteModelBase(with_metaclass(ABCMeta, AgnocompleteBase)):
+class AgnocompleteModelBase(AgnocompleteBase, metaclass=ABCMeta):
 
     model = None
     requires_authentication = False
@@ -349,7 +348,7 @@ def get_queryset(self):
     """
 
     def __init__(self, *args, **kwargs):
-        super(AgnocompleteModel, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.__final_queryset = None
 
     def _construct_qs_filter(self, field_name):
@@ -515,7 +514,7 @@ def selected(self, ids):
         return result
 
 
-class AgnocompleteUrlProxy(with_metaclass(ABCMeta, AgnocompleteBase)):
+class AgnocompleteUrlProxy(AgnocompleteBase, metaclass=ABCMeta):
     """
     This class serves as a proxy between your application and a 3rd party
     URL (typically a REST HTTP API).

agnocomplete/fields.py

@@ -3,9 +3,6 @@
 
 """
 from django import forms
-
-import six
-
 from .core import AgnocompleteBase
 from .constants import AGNOCOMPLETE_USER_ATTRIBUTE
 from .widgets import AgnocompleteSelect, AgnocompleteMultiSelect
@@ -22,7 +19,7 @@
 ]
 
 
-class AgnocompleteMixin(object):
+class AgnocompleteMixin:
     """
     Handles the Agnocomplete generic handling for fields.
     """
@@ -55,7 +52,7 @@ class SearchForm(forms.Form):
 
         """
         # If string, use register to fetch the class
-        if isinstance(klass_or_instance, six.string_types):
+        if isinstance(klass_or_instance, str):
             registry = get_agnocomplete_registry()
             if klass_or_instance not in registry:
                 raise UnregisteredAgnocompleteException(
@@ -100,16 +97,15 @@ def clean(self, *args, **kwargs):
         the user context.
         """
         self.transmit_agnocomplete_context()
-        return super(AgnocompleteMixin, self).clean(*args, **kwargs)
+        return super().clean(*args, **kwargs)
 
 
-class AgnocompleteContextQuerysetMixin(object):
+class AgnocompleteContextQuerysetMixin:
     def transmit_agnocomplete_context(self):
         """
         We'll reset the current queryset only if the user is set.
         """
-        user = super(AgnocompleteContextQuerysetMixin, self) \
-            .transmit_agnocomplete_context()
+        user = super().transmit_agnocomplete_context()
         if user:
             self.queryset = self.agnocomplete.get_queryset()
         return user
@@ -121,8 +117,7 @@ class AgnocompleteField(AgnocompleteMixin, forms.ChoiceField):
     """
     def __init__(self, agnocomplete, user=None, **kwargs):
         self.set_agnocomplete(agnocomplete, user)
-        super(AgnocompleteField, self).__init__(
-            choices=self.agnocomplete.get_choices(), **kwargs)
+        super().__init__(choices=self.agnocomplete.get_choices(), **kwargs)
         self._setup_agnocomplete_widget()
 
 
@@ -134,8 +129,7 @@ class AgnocompleteModelField(AgnocompleteContextQuerysetMixin,
     """
     def __init__(self, agnocomplete, user=None, **kwargs):
         self.set_agnocomplete(agnocomplete, user)
-        super(AgnocompleteModelField, self).__init__(
-            self.agnocomplete.get_choices(), **kwargs)
+        super().__init__(self.agnocomplete.get_choices(), **kwargs)
         self._setup_agnocomplete_widget()
 
 
@@ -147,7 +141,7 @@ class AgnocompleteMultipleMixin(AgnocompleteMixin):
     clean_empty = True
 
     def _setup_agnocomplete_widget(self):
-        super(AgnocompleteMultipleMixin, self)._setup_agnocomplete_widget()
+        super()._setup_agnocomplete_widget()
         # self.widget is a thing here
         self.widget.create = self.create
 
@@ -163,7 +157,7 @@ def empty_value(self):
     def to_python(self, value):
         # Pre-clean the list value
         value = self.clear_list_value(value)
-        value = super(AgnocompleteMultipleMixin, self).to_python(value)
+        value = super().to_python(value)
         # return the new cleaned value or the default empty_value
         return value or self.empty_value
 
@@ -189,8 +183,7 @@ def __init__(self, agnocomplete, user=None,
                  create=False, create_field=False, **kwargs):
         self.set_agnocomplete(agnocomplete, user)
         self.set_create_field(create=create, create_field=create_field)
-        super(AgnocompleteMultipleField, self).__init__(
-            choices=self.agnocomplete.get_choices(), **kwargs)
+        super().__init__(choices=self.agnocomplete.get_choices(), **kwargs)
         self._setup_agnocomplete_widget()
 
 
@@ -204,8 +197,7 @@ def __init__(self, agnocomplete, user=None,
                  create=False, create_field=False, **kwargs):
         self.set_agnocomplete(agnocomplete, user)
         self.set_create_field(create=create, create_field=create_field)
-        super(AgnocompleteModelMultipleField, self).__init__(
-            self.agnocomplete.get_choices(), **kwargs)
+        super().__init__(self.agnocomplete.get_choices(), **kwargs)
         self._setup_agnocomplete_widget()
         self._new_values = []
 
@@ -255,7 +247,7 @@ def clean(self, value):
         """
         if not self.create:
             # No new value can be created, use the regular clean field
-            return super(AgnocompleteModelMultipleField, self).clean(value)
+            return super().clean(value)
 
         # We have to do this here before the call to "super".
         # It'll be called again, but we can't find a way to "pre_clean" the
@@ -266,12 +258,12 @@ def clean(self, value):
         pks = [v for v in value if v.isdigit()]
         self._new_values = [v for v in value if not v.isdigit()]
 
-        qs = super(AgnocompleteModelMultipleField, self).clean(pks)
+        qs = super().clean(pks)
 
         return qs
 
 
-class AgnocompleteUrlProxyMixin(object):
+class AgnocompleteUrlProxyMixin:
     """
     This mixin can be used with a field which actually using
     :class:`agnocomplete.core.AutocompletUrlProxy`. The main purpose is to

agnocomplete/forms.py

@@ -1,7 +1,7 @@
 from .constants import AGNOCOMPLETE_USER_ATTRIBUTE
 
 
-class UserContextFormMixin(object):
+class UserContextFormMixin:
     """
     Form Mixin that passes the user context to its fields.
 
@@ -14,7 +14,7 @@ class UserContextFormMixin(object):
     """
     def __init__(self, user, *args, **kwargs):
         self.user = user
-        super(UserContextFormMixin, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         if self.user:
             for field in self.fields.values():
                 setattr(field, AGNOCOMPLETE_USER_ATTRIBUTE, self.user)

agnocomplete/views.py

@@ -1,7 +1,6 @@
 """
 Agnocomplete views.
 """
-from six import with_metaclass
 from abc import abstractmethod, ABCMeta
 from django.core.exceptions import PermissionDenied, SuspiciousOperation
 from django.http import Http404, JsonResponse
@@ -46,7 +45,7 @@ def get_error(exc):
     return 500, exc
 
 
-class AgnocompleteJSONView(with_metaclass(ABCMeta, View)):
+class AgnocompleteJSONView(View, metaclass=ABCMeta):
     """
     Generic toolbox for JSON-returning views
     """
@@ -94,7 +93,7 @@ def get(self, *args, **kwargs):
             )
 
 
-class RegistryMixin(object):
+class RegistryMixin:
     """
     This mixin is able to return the agnocomplete registry.
     """
@@ -106,7 +105,7 @@ def registry(self):
         return get_agnocomplete_registry()
 
 
-class UserContextFormViewMixin(object):
+class UserContextFormViewMixin:
     """
     This mixin is injecting the context variable into the form kwargs
     """
@@ -127,7 +126,7 @@ def get_form_kwargs(self):
         :meth:`get_agnocomplete_context`. Override this method to adjust it to
         your needs.
         """
-        data = super(UserContextFormViewMixin, self).get_form_kwargs()
+        data = super().get_form_kwargs()
         data.update({
             'user': self.get_agnocomplete_context(),
         })

agnocomplete/widgets.py

@@ -17,7 +17,7 @@
 ]
 
 
-class AgnocompleteWidgetMixin(object):
+class AgnocompleteWidgetMixin:
     def _agnocomplete_build_attrs(self, attrs):
         data_url = reverse_lazy(
             '{}:agnocomplete'.format(get_namespace()),
@@ -42,15 +42,14 @@ def _agnocomplete_build_attrs(self, attrs):
     Generic toolset for building Agnocomplete-ready widgets
     """
     def build_attrs(self, base_attrs, extra_attrs=None):
-        attrs = super(AgnocompleteWidgetMixin, self).build_attrs(
-            base_attrs, extra_attrs)
+        attrs = super().build_attrs(base_attrs, extra_attrs)
         return self._agnocomplete_build_attrs(attrs)
 
     """
     Render only selected options
     """
     def optgroups(self, name, value, attrs=None):
-        selected_ids = set(text(v) for v in value)
+        selected_ids = {text(v) for v in value}
         selected_choices = self.agnocomplete.selected(selected_ids)
         options = []
         groups = [
@@ -89,12 +88,11 @@ class AgnocompleteMultiSelect(AgnocompleteWidgetMixin, widgets.SelectMultiple):
     A multi-selection-ready Select widget Mixin
     """
     def __init__(self, create=False, *args, **kwargs):
-        super(AgnocompleteMultiSelect, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.create = create
 
     def _agnocomplete_build_attrs(self, attrs):
-        attrs = super(AgnocompleteMultiSelect, self). \
-            _agnocomplete_build_attrs(attrs)
+        attrs = super()._agnocomplete_build_attrs(attrs)
 
         if self.create:
             attrs.update({'data-create': 'on'})

demo/authentication.py

@@ -8,7 +8,7 @@
 from .models import Person
 
 
-class PersonBackend(object):
+class PersonBackend:
     """
     Authenticate against the Person model.
     """

demo/autocomplete.py

@@ -29,7 +29,7 @@ class AutocompleteColor(AgnocompleteChoices):
 class AutocompleteColorExtra(AutocompleteColor):
     def items(self, query, **kwargs):
         extra_argument = kwargs.get('extra_argument', None)
-        result = super(AutocompleteColorExtra, self).items(query, **kwargs)
+        result = super().items(query, **kwargs)
         # This is a very dummy usage of the extra argument
         if extra_argument:
             result.append({'value': 'EXTRA', 'label': 'EXTRA'})
@@ -91,7 +91,7 @@ class AutocompletePersonShort(AutocompletePerson):
 
 class AutocompletePersonLabel(AutocompletePerson):
     def label(self, current_item):
-        return u'{item} {mail}'.format(
+        return '{item} {mail}'.format(
             item=text(current_item), mail=current_item.email)
 
 
@@ -131,7 +131,7 @@ def selected(self, ids):
         # Introducing a new variable here, to make sure the
         # "account_registrations" property is able to fetch the matricules.
         self._selected_queryset = self.get_queryset()
-        return super(AutocompletePersonDomainSpecial, self).selected(ids)
+        return super().selected(ids)
 
 
 # Do not register this, it's for custom view demo
@@ -236,8 +236,7 @@ class AutocompleteUrlSimpleAuth(AutocompleteUrlMixin):
     url_search_string = 'url-proxy:simple-auth'
 
     def get_http_call_kwargs(self, query):
-        query_args = super(
-            AutocompleteUrlSimpleAuth, self).get_http_call_kwargs(query)
+        query_args = super().get_http_call_kwargs(query)
         query_args['auth_token'] = GOODAUTHTOKEN
         return query_args
 
@@ -278,7 +277,7 @@ class AutocompleteUrlSkipItem(AutocompleteUrlSimple):
     def item(self, obj):
         if obj['label'] == 'first person':
             raise SkipItem
-        return super(AutocompleteUrlSkipItem, self).item(obj)
+        return super().item(obj)
 
     def get_item_url(self, pk):
         return '{}{}'.format(

demo/forms.py

@@ -118,7 +118,7 @@ class PersonEmailSearchForm(forms.Form):
                                                   to_field_name='email')
 
 
-class UrlProxyFormMixin(object):
+class UrlProxyFormMixin:
     help_text = """
 We're not using the usual fixture here. Here's our "database":
 -------

demo/models.py

@@ -29,7 +29,7 @@ def save(self, *args, **kwargs):
         if "update_fields" in kwargs:
             if 'last_login' in kwargs['update_fields']:
                 kwargs['update_fields'].remove('last_login')
-        return super(Person, self).save(*args, **kwargs)
+        return super().save(*args, **kwargs)
 
 
 class FavoriteColor(models.Model):
@@ -54,9 +54,9 @@ class PersonTag(models.Model):
     tags = models.ManyToManyField(Tag)
 
     def __unicode__(self):
-        return u"{} is tagged: {}".format(
+        return "{} is tagged: {}".format(
             self.person,
-            u", ".join([force_str(t) for t in self.tags.all()]) or u"Nothing"
+            ", ".join([force_str(t) for t in self.tags.all()]) or "Nothing"
         )
     __str__ = __unicode__
 
@@ -66,7 +66,7 @@ class ContextTag(models.Model):
     domain = models.CharField(max_length=100)
 
     def __unicode__(self):
-        return u"[{}] {}".format(
+        return "[{}] {}".format(
             self.domain,
             self.name
         )
@@ -78,8 +78,8 @@ class PersonContextTag(models.Model):
     tags = models.ManyToManyField(ContextTag)
 
     def __unicode__(self):
-        return u"{} is tagged: {}".format(
+        return "{} is tagged: {}".format(
             self.person,
-            u", ".join([force_str(t) for t in self.tags.all()]) or u"Nothing"
+            ", ".join([force_str(t) for t in self.tags.all()]) or "Nothing"
         )
     __str__ = __unicode__