From b807198e6dddb075230abfba90fda62f60ee5800 Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@netboxlabs.com>
Date: Tue, 18 Apr 2023 15:27:05 -0400
Subject: [PATCH] Rename ImportForm to BulkImportForm

---
 netbox/netbox/views/generic/bulk_views.py | 6 +++---
 netbox/utilities/forms/bulk_import.py     | 4 ++--
 netbox/utilities/tests/test_forms.py      | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/netbox/netbox/views/generic/bulk_views.py b/netbox/netbox/views/generic/bulk_views.py
index 8ca77ce55..e66e79a7a 100644
--- a/netbox/netbox/views/generic/bulk_views.py
+++ b/netbox/netbox/views/generic/bulk_views.py
@@ -20,7 +20,7 @@ from extras.signals import clear_webhooks
 from utilities.error_handlers import handle_protectederror
 from utilities.exceptions import AbortRequest, AbortTransaction, PermissionsViolation
 from utilities.forms import BulkRenameForm, ConfirmationForm, restrict_form_fields
-from utilities.forms.bulk_import import ImportForm
+from utilities.forms.bulk_import import BulkImportForm
 from utilities.htmx import is_embedded, is_htmx
 from utilities.permissions import get_permission_for_model
 from utilities.utils import get_viewname
@@ -425,7 +425,7 @@ class BulkImportView(GetReturnURLMixin, BaseMultiObjectView):
     #
 
     def get(self, request):
-        form = ImportForm()
+        form = BulkImportForm()
 
         return render(request, self.template_name, {
             'model': self.model_form._meta.model,
@@ -438,7 +438,7 @@ class BulkImportView(GetReturnURLMixin, BaseMultiObjectView):
     def post(self, request):
         logger = logging.getLogger('netbox.views.BulkImportView')
         model = self.model_form._meta.model
-        form = ImportForm(request.POST, request.FILES)
+        form = BulkImportForm(request.POST, request.FILES)
 
         if form.is_valid():
             logger.debug("Import form validation was successful")
diff --git a/netbox/utilities/forms/bulk_import.py b/netbox/utilities/forms/bulk_import.py
index 675f0149d..b7f432e63 100644
--- a/netbox/utilities/forms/bulk_import.py
+++ b/netbox/utilities/forms/bulk_import.py
@@ -9,11 +9,11 @@ from django.utils.translation import gettext as _
 from core.forms.mixins import SyncedDataMixin
 from utilities.choices import ImportFormatChoices
 from utilities.forms.utils import parse_csv
+from .mixins import BootstrapMixin
 from ..choices import ImportMethodChoices
-from .forms import BootstrapMixin
 
 
-class ImportForm(BootstrapMixin, SyncedDataMixin, forms.Form):
+class BulkImportForm(BootstrapMixin, SyncedDataMixin, forms.Form):
     import_method = forms.ChoiceField(
         choices=ImportMethodChoices,
         required=False
diff --git a/netbox/utilities/tests/test_forms.py b/netbox/utilities/tests/test_forms.py
index d381ffc80..b8cff2996 100644
--- a/netbox/utilities/tests/test_forms.py
+++ b/netbox/utilities/tests/test_forms.py
@@ -2,7 +2,7 @@ from django import forms
 from django.test import TestCase
 
 from utilities.choices import ImportFormatChoices
-from utilities.forms.bulk_import import ImportForm
+from utilities.forms.bulk_import import BulkImportForm
 from utilities.forms.utils import expand_alphanumeric_pattern, expand_ipaddress_pattern
 
 
@@ -288,7 +288,7 @@ class ExpandAlphanumeric(TestCase):
 class ImportFormTest(TestCase):
 
     def test_format_detection(self):
-        form = ImportForm()
+        form = BulkImportForm()
 
         data = (
             "a,b,c\n"