From c28684a8b37bfbd41fc73bfa1f8f0360bd037273 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 15 Jan 2020 16:21:41 -0500 Subject: [PATCH] Remove obsolete utility function model_names_to_filter_dict() --- netbox/extras/api/serializers.py | 1 - netbox/extras/models.py | 2 +- netbox/extras/tests/test_api.py | 1 - netbox/utilities/utils.py | 11 ----------- 4 files changed, 1 insertion(+), 14 deletions(-) diff --git a/netbox/extras/api/serializers.py b/netbox/extras/api/serializers.py index 7f49f4204..0e27a8ee5 100644 --- a/netbox/extras/api/serializers.py +++ b/netbox/extras/api/serializers.py @@ -20,7 +20,6 @@ from utilities.api import ( ChoiceField, ContentTypeField, get_serializer_for_model, SerializerNotFound, SerializedPKRelatedField, ValidatedModelSerializer, ) -from utilities.utils import model_names_to_filter_dict from .nested_serializers import * diff --git a/netbox/extras/models.py b/netbox/extras/models.py index 752892821..1ef503297 100644 --- a/netbox/extras/models.py +++ b/netbox/extras/models.py @@ -13,7 +13,7 @@ from django.urls import reverse from taggit.models import TagBase, GenericTaggedItemBase from utilities.fields import ColorField -from utilities.utils import deepmerge, model_names_to_filter_dict, render_jinja2 +from utilities.utils import deepmerge, render_jinja2 from .choices import * from .constants import * from .querysets import ConfigContextQuerySet diff --git a/netbox/extras/tests/test_api.py b/netbox/extras/tests/test_api.py index 8957f24f9..40579f631 100644 --- a/netbox/extras/tests/test_api.py +++ b/netbox/extras/tests/test_api.py @@ -13,7 +13,6 @@ from extras.models import ConfigContext, Graph, ExportTemplate, Tag from extras.scripts import BooleanVar, IntegerVar, Script, StringVar from tenancy.models import Tenant, TenantGroup from utilities.testing import APITestCase, choices_to_dict -from utilities.utils import model_names_to_filter_dict class ChoicesTest(APITestCase): diff --git a/netbox/utilities/utils.py b/netbox/utilities/utils.py index de3dd8ce6..dc2185988 100644 --- a/netbox/utilities/utils.py +++ b/netbox/utilities/utils.py @@ -62,17 +62,6 @@ def dynamic_import(name): return mod -def model_names_to_filter_dict(names): - """ - Accept a list of content types in the format ['.', '.', ...] and return a dictionary - suitable for QuerySet filtering. - """ - # TODO: This should match on the app_label as well as the model name to avoid potential duplicate names - return { - 'model__in': [model.split('.')[1] for model in names], - } - - def get_subquery(model, field): """ Return a Subquery suitable for annotating a child object count.