Relocate ImportFormatChoices

netbox/dcim/tests/test_views.py

@@ -17,7 +17,7 @@ from dcim.constants import *
 from dcim.models import *
 from ipam.models import ASN, RIR, VLAN, VRF
 from tenancy.models import Tenant
-from utilities.forms.choices import ImportFormatChoices
+from utilities.choices import ImportFormatChoices
 from utilities.testing import ViewTestCases, create_tags, create_test_device, post_data
 from wireless.models import WirelessLAN
 

netbox/netbox/tests/test_import.py

@@ -3,7 +3,7 @@ from django.test import override_settings
 
 from dcim.models import *
 from users.models import ObjectPermission
-from utilities.forms.choices import ImportFormatChoices
+from utilities.choices import ImportFormatChoices
 from utilities.testing import ModelViewTestCase, create_tags
 
 

netbox/netbox/views/generic/bulk_views.py

@@ -16,10 +16,10 @@ from django_tables2.export import TableExport
 
 from extras.models import ExportTemplate
 from extras.signals import clear_webhooks
+from utilities.choices import ImportFormatChoices
 from utilities.error_handlers import handle_protectederror
 from utilities.exceptions import AbortRequest, AbortTransaction, PermissionsViolation
 from utilities.forms import BulkRenameForm, ConfirmationForm, ImportForm, restrict_form_fields
-from utilities.forms.choices import ImportFormatChoices
 from utilities.htmx import is_htmx
 from utilities.permissions import get_permission_for_model
 from utilities.views import GetReturnURLMixin

netbox/utilities/choices.py

@@ -197,3 +197,19 @@ class ButtonColorChoices(ChoiceSet):
         (BLACK, 'Black'),
         (WHITE, 'White'),
     )
+
+
+#
+# Import Choices
+#
+
+class ImportFormatChoices(ChoiceSet):
+    CSV = 'csv'
+    JSON = 'json'
+    YAML = 'yaml'
+
+    CHOICES = [
+        (CSV, 'CSV'),
+        (JSON, 'JSON'),
+        (YAML, 'YAML'),
+    ]

netbox/utilities/forms/choices.py

@@ -1,17 +0,0 @@
-from utilities.choices import ChoiceSet
-
-
-#
-# Import Choices
-#
-
-class ImportFormatChoices(ChoiceSet):
-    CSV = 'csv'
-    JSON = 'json'
-    YAML = 'yaml'
-
-    CHOICES = [
-        (CSV, 'CSV'),
-        (JSON, 'JSON'),
-        (YAML, 'YAML'),
-    ]

netbox/utilities/forms/forms.py

@@ -7,8 +7,8 @@ import yaml
 from django import forms
 from django.utils.translation import gettext as _
 
+from utilities.choices import ImportFormatChoices
 from utilities.forms.utils import parse_csv
-from .choices import ImportFormatChoices
 from .widgets import APISelect, APISelectMultiple, ClearableFileInput, StaticSelect
 
 __all__ = (

netbox/utilities/testing/views.py

@@ -9,7 +9,7 @@ from django.urls import reverse
 from extras.choices import ObjectChangeActionChoices
 from extras.models import ObjectChange
 from users.models import ObjectPermission
-from utilities.forms.choices import ImportFormatChoices
+from utilities.choices import ImportFormatChoices
 from .base import ModelTestCase
 from .utils import disable_warnings, post_data