Clean up errant changes

netbox/dcim/choices.py

@@ -1438,10 +1438,10 @@ class PowerFeedTypeChoices(ChoiceSet):
     TYPE_PRIMARY = 'primary'
     TYPE_REDUNDANT = 'redundant'
 
-    CHOICES = [
+    CHOICES = (
         (TYPE_PRIMARY, 'Primary', 'green'),
         (TYPE_REDUNDANT, 'Redundant', 'cyan'),
-    ]
+    )
 
 
 class PowerFeedSupplyChoices(ChoiceSet):

netbox/dcim/forms/bulk_edit.py

@@ -901,10 +901,6 @@ class InterfaceTemplateBulkEditForm(BulkEditForm):
         required=False,
         widget=BulkEditNullBooleanSelect
     )
-    enabled = forms.NullBooleanField(
-        required=False,
-        widget=BulkEditNullBooleanSelect
-    )
     mgmt_only = forms.NullBooleanField(
         required=False,
         widget=BulkEditNullBooleanSelect,

netbox/dcim/views.py

@@ -16,7 +16,7 @@ from jinja2.exceptions import TemplateError
 
 from circuits.models import Circuit, CircuitTermination
 from extras.views import ObjectConfigContextView
-from ipam.models import ASN, IPAddress, Prefix, Service, VLAN, VLANGroup
+from ipam.models import ASN, IPAddress, Prefix, VLAN, VLANGroup
 from ipam.tables import InterfaceVLANTable
 from netbox.views import generic
 from utilities.forms import ConfirmationForm

netbox/tenancy/forms/filtersets.py

@@ -8,7 +8,7 @@ from tenancy.choices import *
 from tenancy.models import *
 from tenancy.forms import ContactModelFilterForm
 from utilities.forms.fields import (
-    ContentTypeMultipleChoiceField, DynamicModelMultipleChoiceField, MultipleChoiceField, TagFilterField,
+    ContentTypeMultipleChoiceField, DynamicModelMultipleChoiceField, TagFilterField,
 )
 
 __all__ = (