From 409903d0179d63ab8fb8a313d7f0c12b4080a76e Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 24 Oct 2023 11:13:08 -0400 Subject: [PATCH] Move backend utils from core app to netbox --- netbox/core/api/serializers.py | 2 +- netbox/core/data_backends.py | 2 +- netbox/core/filtersets.py | 2 +- netbox/core/forms/bulk_edit.py | 2 +- netbox/core/forms/filtersets.py | 2 +- netbox/core/forms/model_forms.py | 2 +- netbox/netbox/plugins/__init__.py | 2 +- netbox/{core => netbox}/utils.py | 0 8 files changed, 7 insertions(+), 7 deletions(-) rename netbox/{core => netbox}/utils.py (100%) diff --git a/netbox/core/api/serializers.py b/netbox/core/api/serializers.py index 6feda6187..0bdd9e427 100644 --- a/netbox/core/api/serializers.py +++ b/netbox/core/api/serializers.py @@ -4,9 +4,9 @@ from rest_framework import serializers from core.choices import * from core.models import * -from core.utils import get_data_backend_choices from netbox.api.fields import ChoiceField, ContentTypeField from netbox.api.serializers import BaseModelSerializer, NetBoxModelSerializer +from netbox.utils import get_data_backend_choices from users.api.nested_serializers import NestedUserSerializer from .nested_serializers import * diff --git a/netbox/core/data_backends.py b/netbox/core/data_backends.py index 458896fd1..9ff0b4d63 100644 --- a/netbox/core/data_backends.py +++ b/netbox/core/data_backends.py @@ -10,8 +10,8 @@ from django import forms from django.conf import settings from django.utils.translation import gettext as _ -from core.utils import register_data_backend from netbox.data_backends import DataBackend +from netbox.utils import register_data_backend from .exceptions import SyncError __all__ = ( diff --git a/netbox/core/filtersets.py b/netbox/core/filtersets.py index 97a3a0934..410e2e80c 100644 --- a/netbox/core/filtersets.py +++ b/netbox/core/filtersets.py @@ -4,9 +4,9 @@ from django.utils.translation import gettext as _ import django_filters from netbox.filtersets import BaseFilterSet, ChangeLoggedModelFilterSet, NetBoxModelFilterSet +from netbox.utils import get_data_backend_choices from .choices import * from .models import * -from .utils import get_data_backend_choices __all__ = ( 'DataFileFilterSet', diff --git a/netbox/core/forms/bulk_edit.py b/netbox/core/forms/bulk_edit.py index 8c7354d84..dcc92c6f0 100644 --- a/netbox/core/forms/bulk_edit.py +++ b/netbox/core/forms/bulk_edit.py @@ -2,8 +2,8 @@ from django import forms from django.utils.translation import gettext_lazy as _ from core.models import * -from core.utils import get_data_backend_choices from netbox.forms import NetBoxModelBulkEditForm +from netbox.utils import get_data_backend_choices from utilities.forms.fields import CommentField from utilities.forms.widgets import BulkEditNullBooleanSelect diff --git a/netbox/core/forms/filtersets.py b/netbox/core/forms/filtersets.py index b4c517203..4d0acbb77 100644 --- a/netbox/core/forms/filtersets.py +++ b/netbox/core/forms/filtersets.py @@ -5,10 +5,10 @@ from django.utils.translation import gettext_lazy as _ from core.choices import * from core.models import * -from core.utils import get_data_backend_choices from extras.forms.mixins import SavedFiltersMixin from extras.utils import FeatureQuery from netbox.forms import NetBoxModelFilterSetForm +from netbox.utils import get_data_backend_choices from utilities.forms import BOOLEAN_WITH_BLANK_CHOICES, FilterForm from utilities.forms.fields import ContentTypeChoiceField, DynamicModelMultipleChoiceField from utilities.forms.widgets import APISelectMultiple, DateTimePicker diff --git a/netbox/core/forms/model_forms.py b/netbox/core/forms/model_forms.py index e5d6a82d6..e3184acf6 100644 --- a/netbox/core/forms/model_forms.py +++ b/netbox/core/forms/model_forms.py @@ -5,9 +5,9 @@ from django.utils.translation import gettext_lazy as _ from core.forms.mixins import SyncedDataMixin from core.models import * -from core.utils import get_data_backend_choices from netbox.forms import NetBoxModelForm from netbox.registry import registry +from netbox.utils import get_data_backend_choices from utilities.forms import get_field_value from utilities.forms.fields import CommentField from utilities.forms.widgets import HTMXSelect diff --git a/netbox/netbox/plugins/__init__.py b/netbox/netbox/plugins/__init__.py index 436b39dec..8b6901b7a 100644 --- a/netbox/netbox/plugins/__init__.py +++ b/netbox/netbox/plugins/__init__.py @@ -6,9 +6,9 @@ from django.core.exceptions import ImproperlyConfigured from django.utils.module_loading import import_string from packaging import version -from core.utils import register_data_backend from netbox.registry import registry from netbox.search import register_search +from netbox.utils import register_data_backend from .navigation import * from .registration import * from .templates import * diff --git a/netbox/core/utils.py b/netbox/netbox/utils.py similarity index 100% rename from netbox/core/utils.py rename to netbox/netbox/utils.py