From 38b245700a297da78eb02a1d93a211342fa931f6 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 10 Oct 2024 15:57:12 -0400 Subject: [PATCH] Resolve F811 errors --- netbox/dcim/tables/devicetypes.py | 3 +-- netbox/dcim/tests/test_filtersets.py | 7 ------- netbox/extras/tests/test_customvalidators.py | 2 +- netbox/vpn/filtersets.py | 11 ----------- netbox/vpn/tests/test_filtersets.py | 7 ------- 5 files changed, 2 insertions(+), 28 deletions(-) diff --git a/netbox/dcim/tables/devicetypes.py b/netbox/dcim/tables/devicetypes.py index 69ff8b3a2..e8a4e35f1 100644 --- a/netbox/dcim/tables/devicetypes.py +++ b/netbox/dcim/tables/devicetypes.py @@ -1,6 +1,5 @@ -from django.utils.translation import gettext_lazy as _ import django_tables2 as tables -from django.utils.translation import gettext as _ +from django.utils.translation import gettext_lazy as _ from dcim import models from netbox.tables import NetBoxTable, columns diff --git a/netbox/dcim/tests/test_filtersets.py b/netbox/dcim/tests/test_filtersets.py index afb360d76..6c65cad93 100644 --- a/netbox/dcim/tests/test_filtersets.py +++ b/netbox/dcim/tests/test_filtersets.py @@ -4838,13 +4838,6 @@ class InventoryItemTestCase(TestCase, ChangeLoggedFilterSetTests): params = {'device_role': [role[0].slug, role[1].slug]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4) - def test_role(self): - role = DeviceRole.objects.all()[:2] - params = {'role_id': [role[0].pk, role[1].pk]} - self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4) - params = {'role': [role[0].slug, role[1].slug]} - self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4) - def test_device(self): devices = Device.objects.all()[:2] params = {'device_id': [devices[0].pk, devices[1].pk]} diff --git a/netbox/extras/tests/test_customvalidators.py b/netbox/extras/tests/test_customvalidators.py index 49deb9da5..9f85b4913 100644 --- a/netbox/extras/tests/test_customvalidators.py +++ b/netbox/extras/tests/test_customvalidators.py @@ -162,7 +162,7 @@ class CustomValidatorTest(TestCase): Site(name='abcdef123', slug='abcdef123').clean() @override_settings(CUSTOM_VALIDATORS={'dcim.site': [region_validator]}) - def test_valid(self): + def test_related_object(self): region1 = Region(name='Foo', slug='foo') region1.save() region2 = Region(name='Bar', slug='bar') diff --git a/netbox/vpn/filtersets.py b/netbox/vpn/filtersets.py index 92aa702c6..6403b662f 100644 --- a/netbox/vpn/filtersets.py +++ b/netbox/vpn/filtersets.py @@ -147,17 +147,6 @@ class IKEProposalFilterSet(NetBoxModelFilterSet): group = django_filters.MultipleChoiceFilter( choices=DHGroupChoices ) - ike_policy_id = django_filters.ModelMultipleChoiceFilter( - field_name='ike_policies', - queryset=IKEPolicy.objects.all(), - label=_('IKE policy (ID)'), - ) - ike_policy = django_filters.ModelMultipleChoiceFilter( - field_name='ike_policies__name', - queryset=IKEPolicy.objects.all(), - to_field_name='name', - label=_('IKE policy (name)'), - ) class Meta: model = IKEProposal diff --git a/netbox/vpn/tests/test_filtersets.py b/netbox/vpn/tests/test_filtersets.py index 0b9c79420..d2b893766 100644 --- a/netbox/vpn/tests/test_filtersets.py +++ b/netbox/vpn/tests/test_filtersets.py @@ -385,13 +385,6 @@ class IKEProposalTestCase(TestCase, ChangeLoggedFilterSetTests): params = {'sa_lifetime': [1000, 2000]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) - def test_ike_policy(self): - ike_policies = IKEPolicy.objects.all()[:2] - params = {'ike_policy_id': [ike_policies[0].pk, ike_policies[1].pk]} - self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) - params = {'ike_policy': [ike_policies[0].name, ike_policies[1].name]} - self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) - class IKEPolicyTestCase(TestCase, ChangeLoggedFilterSetTests): queryset = IKEPolicy.objects.all()