From 02db0bcc2e6b00e965a5efa2c346d9f863290957 Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@netboxlabs.com>
Date: Fri, 12 May 2023 16:21:22 -0400
Subject: [PATCH] Closes #11766: Remove obsolete custom ChoiceField and
 MultipleChoiceField classes

---
 docs/plugins/development/forms.md       | 13 -------------
 docs/release-notes/version-3.6.md       |  7 +++++++
 mkdocs.yml                              |  1 +
 netbox/utilities/forms/fields/fields.py | 23 -----------------------
 4 files changed, 8 insertions(+), 36 deletions(-)
 create mode 100644 docs/release-notes/version-3.6.md

diff --git a/docs/plugins/development/forms.md b/docs/plugins/development/forms.md
index 51f6c70de..31751855e 100644
--- a/docs/plugins/development/forms.md
+++ b/docs/plugins/development/forms.md
@@ -165,19 +165,6 @@ In addition to the [form fields provided by Django](https://docs.djangoproject.c
     options:
       members: false
 
-## Choice Fields
-
-!!! warning "Obsolete Fields"
-    NetBox's custom `ChoiceField` and `MultipleChoiceField` classes are no longer necessary thanks to improvements made to the user interface. Django's native form fields can be used instead. These custom field classes will be removed in NetBox v3.6.
-
-::: utilities.forms.fields.ChoiceField
-    options:
-      members: false
-
-::: utilities.forms.fields.MultipleChoiceField
-    options:
-      members: false
-
 ## Dynamic Object Fields
 
 ::: utilities.forms.fields.DynamicModelChoiceField
diff --git a/docs/release-notes/version-3.6.md b/docs/release-notes/version-3.6.md
new file mode 100644
index 000000000..45a2acb73
--- /dev/null
+++ b/docs/release-notes/version-3.6.md
@@ -0,0 +1,7 @@
+# NetBox v3.6
+
+## v3.6.0 (FUTURE)
+
+### Other Changes
+
+* [#11766](https://github.com/netbox-community/netbox/issues/11766) - Remove obsolete custom `ChoiceField` and `MultipleChoiceField` classes
diff --git a/mkdocs.yml b/mkdocs.yml
index f7da976c3..6be33d592 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -273,6 +273,7 @@ nav:
         - git Cheat Sheet: 'development/git-cheat-sheet.md'
     - Release Notes:
         - Summary: 'release-notes/index.md'
+        - Version 3.6: 'release-notes/version-3.6.md'
         - Version 3.5: 'release-notes/version-3.5.md'
         - Version 3.4: 'release-notes/version-3.4.md'
         - Version 3.3: 'release-notes/version-3.3.md'
diff --git a/netbox/utilities/forms/fields/fields.py b/netbox/utilities/forms/fields/fields.py
index cb8c14d6d..c1e1e481c 100644
--- a/netbox/utilities/forms/fields/fields.py
+++ b/netbox/utilities/forms/fields/fields.py
@@ -11,13 +11,11 @@ from utilities.forms import widgets
 from utilities.validators import EnhancedURLValidator
 
 __all__ = (
-    'ChoiceField',
     'ColorField',
     'CommentField',
     'JSONField',
     'LaxURLField',
     'MACAddressField',
-    'MultipleChoiceField',
     'SlugField',
     'TagFilterField',
 )
@@ -128,24 +126,3 @@ class MACAddressField(forms.Field):
             raise forms.ValidationError(self.error_messages['invalid'], code='invalid')
 
         return value
-
-
-#
-# Choice fields
-#
-
-class ChoiceField(forms.ChoiceField):
-    """
-    Previously used to override Django's built-in `ChoiceField` to use NetBox's now-obsolete `StaticSelect` widget.
-    """
-    # TODO: Remove in v3.6
-    pass
-
-
-class MultipleChoiceField(forms.MultipleChoiceField):
-    """
-    Previously used to override Django's built-in `MultipleChoiceField` to use NetBox's now-obsolete
-    `StaticSelectMultiple` widget.
-    """
-    # TODO: Remove in v3.6
-    pass