fix(generic): replace custom filterset factory with upstream one

The filterset factory was implemented upstream, so we can drop our
custom version and use the one from django-filter.

Closes: #952

apis_core/generic/filterbackends.py

@@ -1,6 +1,7 @@
+from django_filters.filterset import filterset_factory
 from django_filters.rest_framework import DjangoFilterBackend
 
-from .filtersets import GenericFilterSet, filterset_factory
+from .filtersets import GenericFilterSet
 from .helpers import first_member_match, module_paths
 
 

apis_core/generic/filtersets.py

@@ -1,4 +1,3 @@
-from django_filters.constants import ALL_FIELDS
 from django_filters.filterset import FilterSet
 
 from .forms import GenericFilterSetForm
@@ -13,14 +12,3 @@ class GenericFilterSet(FilterSet):
 
  class Meta:
  form = GenericFilterSetForm
-
-
-# This is a backport from https://github.com/carltongibson/django-filter/pull/1636
-# It can be removed once that is merged and released
-def filterset_factory(model, filterset=FilterSet, fields=ALL_FIELDS):
- attrs = {"model": model, "fields": fields}
- bases = (filterset.Meta,) if hasattr(filterset, "Meta") else ()
- Meta = type("Meta", bases, attrs)
- return type(filterset)(
- str("%sFilterSet" % model._meta.object_name), (filterset,), {"Meta": Meta}
- )

apis_core/generic/views.py

@@ -9,6 +9,7 @@
 from django.views.generic import DetailView
 from django.views.generic.base import TemplateView
 from django.views.generic.edit import CreateView, DeleteView, FormView, UpdateView
+from django_filters.filterset import filterset_factory
 from django_filters.views import FilterView
 from django_tables2 import SingleTableMixin
 from django_tables2.columns import library
@@ -17,7 +18,7 @@
 from apis_core.core.mixins import ListViewObjectFilterMixin
 from apis_core.utils.helpers import create_object_from_uri
 
-from .filtersets import GenericFilterSet, filterset_factory
+from .filtersets import GenericFilterSet
 from .forms import GenericImportForm, GenericModelForm
 from .helpers import (
  first_member_match,