From 7a5cf8041279dab266122f82244441a6482bead6 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 5 Mar 2021 12:48:53 -0500 Subject: [PATCH] Clean up extraneous imports --- netbox/dcim/models/device_component_templates.py | 2 -- netbox/dcim/models/device_components.py | 3 +-- netbox/dcim/models/sites.py | 4 +--- netbox/ipam/models/ip.py | 3 +-- netbox/tenancy/models.py | 2 +- netbox/virtualization/models.py | 2 +- 6 files changed, 5 insertions(+), 11 deletions(-) diff --git a/netbox/dcim/models/device_component_templates.py b/netbox/dcim/models/device_component_templates.py index 99de34466..3e81cd3f2 100644 --- a/netbox/dcim/models/device_component_templates.py +++ b/netbox/dcim/models/device_component_templates.py @@ -4,13 +4,11 @@ from django.db import models from dcim.choices import * from dcim.constants import * -from extras.models import ObjectChange from extras.utils import extras_features from netbox.models import BigIDModel, ChangeLoggingMixin from utilities.fields import NaturalOrderingField from utilities.querysets import RestrictedQuerySet from utilities.ordering import naturalize_interface -from utilities.utils import serialize_object from .device_components import ( ConsolePort, ConsoleServerPort, DeviceBay, FrontPort, Interface, PowerOutlet, PowerPort, RearPort, ) diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py index b5b69a5f2..68bf604ae 100644 --- a/netbox/dcim/models/device_components.py +++ b/netbox/dcim/models/device_components.py @@ -11,7 +11,7 @@ from taggit.managers import TaggableManager from dcim.choices import * from dcim.constants import * from dcim.fields import MACAddressField -from extras.models import ObjectChange, TaggedItem +from extras.models import TaggedItem from extras.utils import extras_features from netbox.models import PrimaryModel from utilities.fields import NaturalOrderingField @@ -19,7 +19,6 @@ from utilities.mptt import TreeManager from utilities.ordering import naturalize_interface from utilities.querysets import RestrictedQuerySet from utilities.query_functions import CollateAsChar -from utilities.utils import serialize_object __all__ = ( diff --git a/netbox/dcim/models/sites.py b/netbox/dcim/models/sites.py index 417e0b914..5aea4461f 100644 --- a/netbox/dcim/models/sites.py +++ b/netbox/dcim/models/sites.py @@ -8,13 +8,11 @@ from timezone_field import TimeZoneField from dcim.choices import * from dcim.constants import * from dcim.fields import ASNField -from extras.models import ObjectChange, TaggedItem +from extras.models import TaggedItem from extras.utils import extras_features from netbox.models import NestedGroupModel, PrimaryModel from utilities.fields import NaturalOrderingField from utilities.querysets import RestrictedQuerySet -from utilities.mptt import TreeManager -from utilities.utils import serialize_object __all__ = ( 'Region', diff --git a/netbox/ipam/models/ip.py b/netbox/ipam/models/ip.py index b37b67c79..c2c4fbf82 100644 --- a/netbox/ipam/models/ip.py +++ b/netbox/ipam/models/ip.py @@ -9,7 +9,7 @@ from django.urls import reverse from taggit.managers import TaggableManager from dcim.models import Device -from extras.models import ObjectChange, TaggedItem +from extras.models import TaggedItem from extras.utils import extras_features from netbox.models import OrganizationalModel, PrimaryModel from ipam.choices import * @@ -19,7 +19,6 @@ from ipam.managers import IPAddressManager from ipam.querysets import PrefixQuerySet from ipam.validators import DNSValidator from utilities.querysets import RestrictedQuerySet -from utilities.utils import serialize_object from virtualization.models import VirtualMachine diff --git a/netbox/tenancy/models.py b/netbox/tenancy/models.py index 757afb09e..60c945447 100644 --- a/netbox/tenancy/models.py +++ b/netbox/tenancy/models.py @@ -3,7 +3,7 @@ from django.urls import reverse from mptt.models import MPTTModel, TreeForeignKey from taggit.managers import TaggableManager -from extras.models import ObjectChange, TaggedItem +from extras.models import TaggedItem from extras.utils import extras_features from netbox.models import NestedGroupModel, PrimaryModel from utilities.mptt import TreeManager diff --git a/netbox/virtualization/models.py b/netbox/virtualization/models.py index 574400359..4280c6b8e 100644 --- a/netbox/virtualization/models.py +++ b/netbox/virtualization/models.py @@ -6,7 +6,7 @@ from django.urls import reverse from taggit.managers import TaggableManager from dcim.models import BaseInterface, Device -from extras.models import ConfigContextModel, ObjectChange, TaggedItem +from extras.models import ConfigContextModel, TaggedItem from extras.querysets import ConfigContextModelQuerySet from extras.utils import extras_features from netbox.models import BigIDModel, ChangeLoggingMixin, OrganizationalModel, PrimaryModel