From 5bf34b0c32534556dfe2b6f45ff4022134850c3e Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 5 Dec 2025 14:28:13 -0500 Subject: [PATCH] Reorder import statements --- netbox/circuits/filtersets.py | 2 +- netbox/core/filtersets.py | 2 +- netbox/dcim/filtersets.py | 2 +- netbox/extras/filtersets.py | 2 +- netbox/ipam/filtersets.py | 4 ++-- netbox/tenancy/filtersets.py | 2 +- netbox/users/filtersets.py | 3 +-- netbox/virtualization/filtersets.py | 2 +- netbox/vpn/filtersets.py | 2 +- netbox/wireless/filtersets.py | 4 ++-- 10 files changed, 12 insertions(+), 13 deletions(-) diff --git a/netbox/circuits/filtersets.py b/netbox/circuits/filtersets.py index cbc04cf9e..faf29584f 100644 --- a/netbox/circuits/filtersets.py +++ b/netbox/circuits/filtersets.py @@ -7,11 +7,11 @@ from dcim.filtersets import CabledObjectFilterSet from dcim.models import Interface, Location, Region, Site, SiteGroup from ipam.models import ASN from netbox.filtersets import NetBoxModelFilterSet, OrganizationalModelFilterSet, PrimaryModelFilterSet -from utilities.filtersets import register_filterset from tenancy.filtersets import ContactModelFilterSet, TenancyFilterSet from utilities.filters import ( ContentTypeFilter, MultiValueCharFilter, MultiValueNumberFilter, TreeNodeMultipleChoiceFilter, ) +from utilities.filtersets import register_filterset from .choices import * from .models import * diff --git a/netbox/core/filtersets.py b/netbox/core/filtersets.py index 874af0f3d..a531c051e 100644 --- a/netbox/core/filtersets.py +++ b/netbox/core/filtersets.py @@ -4,10 +4,10 @@ from django.db.models import Q from django.utils.translation import gettext as _ from netbox.filtersets import BaseFilterSet, ChangeLoggedModelFilterSet, PrimaryModelFilterSet -from utilities.filtersets import register_filterset from netbox.utils import get_data_backend_choices from users.models import User from utilities.filters import ContentTypeFilter +from utilities.filtersets import register_filterset from .choices import * from .models import * diff --git a/netbox/dcim/filtersets.py b/netbox/dcim/filtersets.py index 7887c229b..a3f8ff383 100644 --- a/netbox/dcim/filtersets.py +++ b/netbox/dcim/filtersets.py @@ -14,7 +14,6 @@ from netbox.filtersets import ( AttributeFiltersMixin, BaseFilterSet, ChangeLoggedModelFilterSet, NestedGroupModelFilterSet, OrganizationalModelFilterSet, PrimaryModelFilterSet, NetBoxModelFilterSet, ) -from utilities.filtersets import register_filterset from tenancy.filtersets import ContactModelFilterSet, TenancyFilterSet from tenancy.models import * from users.filterset_mixins import OwnerFilterMixin @@ -23,6 +22,7 @@ from utilities.filters import ( ContentTypeFilter, MultiValueCharFilter, MultiValueMACAddressFilter, MultiValueNumberFilter, MultiValueWWNFilter, NumericArrayFilter, TreeNodeMultipleChoiceFilter, ) +from utilities.filtersets import register_filterset from virtualization.models import Cluster, ClusterGroup, VirtualMachine, VMInterface from vpn.models import L2VPN from wireless.choices import WirelessChannelChoices, WirelessRoleChoices diff --git a/netbox/extras/filtersets.py b/netbox/extras/filtersets.py index fb733fde6..cdc0c75c5 100644 --- a/netbox/extras/filtersets.py +++ b/netbox/extras/filtersets.py @@ -6,13 +6,13 @@ from django.utils.translation import gettext as _ from core.models import DataSource, ObjectType from dcim.models import DeviceRole, DeviceType, Location, Platform, Region, Site, SiteGroup from netbox.filtersets import BaseFilterSet, ChangeLoggedModelFilterSet, NetBoxModelFilterSet, PrimaryModelFilterSet -from utilities.filtersets import register_filterset from tenancy.models import Tenant, TenantGroup from users.filterset_mixins import OwnerFilterMixin from users.models import Group, User from utilities.filters import ( ContentTypeFilter, MultiValueCharFilter, MultiValueNumberFilter ) +from utilities.filtersets import register_filterset from virtualization.models import Cluster, ClusterGroup, ClusterType from .choices import * from .filters import TagFilter, TagIDFilter diff --git a/netbox/ipam/filtersets.py b/netbox/ipam/filtersets.py index 550462119..5063b6a9c 100644 --- a/netbox/ipam/filtersets.py +++ b/netbox/ipam/filtersets.py @@ -1,6 +1,5 @@ import django_filters import netaddr -from dcim.base_filtersets import ScopedFilterSet from django.contrib.contenttypes.models import ContentType from django.core.exceptions import ValidationError from django.db.models import Q @@ -10,15 +9,16 @@ from drf_spectacular.utils import extend_schema_field from netaddr.core import AddrFormatError from circuits.models import Provider +from dcim.base_filtersets import ScopedFilterSet from dcim.models import Device, Interface, Region, Site, SiteGroup from netbox.filtersets import ( ChangeLoggedModelFilterSet, OrganizationalModelFilterSet, NetBoxModelFilterSet, PrimaryModelFilterSet, ) -from utilities.filtersets import register_filterset from tenancy.filtersets import ContactModelFilterSet, TenancyFilterSet from utilities.filters import ( ContentTypeFilter, MultiValueCharFilter, MultiValueNumberFilter, NumericArrayFilter, TreeNodeMultipleChoiceFilter, ) +from utilities.filtersets import register_filterset from virtualization.models import VirtualMachine, VMInterface from vpn.models import L2VPN from .choices import * diff --git a/netbox/tenancy/filtersets.py b/netbox/tenancy/filtersets.py index 5a5f65020..aa463ef50 100644 --- a/netbox/tenancy/filtersets.py +++ b/netbox/tenancy/filtersets.py @@ -5,8 +5,8 @@ from django.utils.translation import gettext as _ from netbox.filtersets import ( NestedGroupModelFilterSet, NetBoxModelFilterSet, OrganizationalModelFilterSet, PrimaryModelFilterSet, ) -from utilities.filtersets import register_filterset from utilities.filters import ContentTypeFilter, TreeNodeMultipleChoiceFilter +from utilities.filtersets import register_filterset from .models import * __all__ = ( diff --git a/netbox/users/filtersets.py b/netbox/users/filtersets.py index 7497dbde4..c9587cca1 100644 --- a/netbox/users/filtersets.py +++ b/netbox/users/filtersets.py @@ -1,14 +1,13 @@ import django_filters - from django.db.models import Q from django.utils.translation import gettext as _ from core.models import ObjectType from extras.models import NotificationGroup from netbox.filtersets import BaseFilterSet -from utilities.filtersets import register_filterset from users.models import Group, ObjectPermission, Owner, OwnerGroup, Token, User from utilities.filters import ContentTypeFilter +from utilities.filtersets import register_filterset __all__ = ( 'GroupFilterSet', diff --git a/netbox/virtualization/filtersets.py b/netbox/virtualization/filtersets.py index ca1c9748e..2c4521cfd 100644 --- a/netbox/virtualization/filtersets.py +++ b/netbox/virtualization/filtersets.py @@ -10,10 +10,10 @@ from extras.filtersets import LocalConfigContextFilterSet from extras.models import ConfigTemplate from ipam.filtersets import PrimaryIPFilterSet from netbox.filtersets import NetBoxModelFilterSet, OrganizationalModelFilterSet, PrimaryModelFilterSet -from utilities.filtersets import register_filterset from tenancy.filtersets import TenancyFilterSet, ContactModelFilterSet from users.filterset_mixins import OwnerFilterMixin from utilities.filters import MultiValueCharFilter, MultiValueMACAddressFilter, TreeNodeMultipleChoiceFilter +from utilities.filtersets import register_filterset from .choices import * from .models import * diff --git a/netbox/vpn/filtersets.py b/netbox/vpn/filtersets.py index 037018bd0..e6fcd87fc 100644 --- a/netbox/vpn/filtersets.py +++ b/netbox/vpn/filtersets.py @@ -6,9 +6,9 @@ from core.models import ObjectType from dcim.models import Device, Interface from ipam.models import IPAddress, RouteTarget, VLAN from netbox.filtersets import NetBoxModelFilterSet, OrganizationalModelFilterSet, PrimaryModelFilterSet -from utilities.filtersets import register_filterset from tenancy.filtersets import ContactModelFilterSet, TenancyFilterSet from utilities.filters import ContentTypeFilter, MultiValueCharFilter, MultiValueNumberFilter +from utilities.filtersets import register_filterset from virtualization.models import VirtualMachine, VMInterface from .choices import * from .models import * diff --git a/netbox/wireless/filtersets.py b/netbox/wireless/filtersets.py index a529910f4..3d10497ea 100644 --- a/netbox/wireless/filtersets.py +++ b/netbox/wireless/filtersets.py @@ -1,14 +1,14 @@ import django_filters from django.db.models import Q -from dcim.choices import LinkStatusChoices from dcim.base_filtersets import ScopedFilterSet +from dcim.choices import LinkStatusChoices from dcim.models import Interface from ipam.models import VLAN from netbox.filtersets import NestedGroupModelFilterSet, PrimaryModelFilterSet -from utilities.filtersets import register_filterset from tenancy.filtersets import TenancyFilterSet from utilities.filters import TreeNodeMultipleChoiceFilter +from utilities.filtersets import register_filterset from .choices import * from .models import *