Python 2 cleanups (#1186)

* Remove explicit inheritance from `object`
* Use argumentless super() syntax

Co-authored-by: Ryan P Kilby <[email protected]>

Author: kaedroho

django_filters/conf.py

@@ -65,7 +65,7 @@ def is_callable(value):
     return callable(value) and not isinstance(value, type)
 
 
-class Settings(object):
+class Settings:
 
     def __getattr__(self, name):
         if name not in DEFAULTS:

django_filters/fields.py

@@ -211,7 +211,7 @@ def clean(self, value):
         return value
 
 
-class ChoiceIterator(object):
+class ChoiceIterator:
     # Emulates the behavior of ModelChoiceIterator, but instead wraps
     # the field's _choices iterable.
 
@@ -257,7 +257,7 @@ def __len__(self):
         return super().__len__() + add
 
 
-class ChoiceIteratorMixin(object):
+class ChoiceIteratorMixin:
     def __init__(self, *args, **kwargs):
         self.null_label = kwargs.pop('null_label', settings.NULL_CHOICE_LABEL)
         self.null_value = kwargs.pop('null_value', settings.NULL_CHOICE_VALUE)

django_filters/filters.py

@@ -62,7 +62,7 @@
 ]
 
 
-class Filter(object):
+class Filter:
     creation_counter = 0
     field_class = forms.Field
 
@@ -291,7 +291,7 @@ class DurationFilter(Filter):
     field_class = forms.DurationField
 
 
-class QuerySetRequestMixin(object):
+class QuerySetRequestMixin:
     """
     Add callable functionality to filters that support the ``queryset``
     argument. If the ``queryset`` is callable, then it **must** accept the
@@ -642,10 +642,10 @@ def field(self):
 
     def filter(self, qs, lookup):
         if not lookup:
-            return super(LookupChoiceFilter, self).filter(qs, None)
+            return super().filter(qs, None)
 
         self.lookup_expr = lookup.lookup_expr
-        return super(LookupChoiceFilter, self).filter(qs, lookup.value)
+        return super().filter(qs, lookup.value)
 
 
 class OrderingFilter(BaseCSVFilter, ChoiceFilter):
@@ -746,7 +746,7 @@ def build_choices(self, fields, labels):
         return [val for pair in zip(ascending, descending) for val in pair]
 
 
-class FilterMethod(object):
+class FilterMethod:
     """
     This helper is used to override Filter.filter() when a 'method' argument
     is passed. It proxies the call to the actual method on the filter's parent.

django_filters/filterset.py

@@ -51,7 +51,7 @@ def remote_queryset(field):
     return model._default_manager.complex_filter(limit_choices_to)
 
 
-class FilterSetOptions(object):
+class FilterSetOptions:
     def __init__(self, options=None):
         self.model = getattr(options, 'model', None)
         self.fields = getattr(options, 'fields', None)
@@ -184,7 +184,7 @@ def visit(name):
 }
 
 
-class BaseFilterSet(object):
+class BaseFilterSet:
     FILTER_DEFAULTS = FILTER_FOR_DBFIELD_DEFAULTS
 
     def __init__(self, data=None, queryset=None, *, request=None, prefix=None):

tests/test_conf.py

@@ -80,7 +80,7 @@ def test_behavior(self):
         def func():
             pass
 
-        class Class(object):
+        class Class:
             def __call__(self):
                 pass