Cleaned up import statements

netbox/circuits/forms.py

@@ -2,13 +2,13 @@ from django import forms
 from django.db.models import Count
 from taggit.forms import TagField
 
-from dcim.models import Site, Device, Rack
+from dcim.models import Site
 from extras.forms import AddRemoveTagsForm, CustomFieldForm, CustomFieldBulkEditForm, CustomFieldFilterForm
 from tenancy.forms import TenancyForm
 from tenancy.models import Tenant
 from utilities.forms import (
-    AnnotatedMultipleChoiceField, APISelect, add_blank_choice, BootstrapMixin, ChainedFieldsMixin,
+    AnnotatedMultipleChoiceField, add_blank_choice, BootstrapMixin, CommentField, CSVChoiceField, FilterChoiceField,
-    ChainedModelChoiceField, CommentField, CSVChoiceField, FilterChoiceField, SmallTextarea, SlugField,
+    SmallTextarea, SlugField,
 )
 from .constants import CIRCUIT_STATUS_CHOICES
 from .models import Circuit, CircuitTermination, CircuitType, Provider

netbox/dcim/forms.py

@@ -1,4 +1,5 @@
 import re
+from operator import attrgetter
 
 from django import forms
 from django.contrib.auth.models import User
@@ -8,7 +9,6 @@ from django.core.exceptions import ObjectDoesNotExist
 from django.db.models import Count, Q
 from mptt.forms import TreeNodeChoiceField
 from natsort import natsorted
-from operator import attrgetter
 from taggit.forms import TagField
 from timezone_field import TimeZoneFormField
 

netbox/dcim/signals.py

@@ -1,4 +1,4 @@
-from django.db.models.signals import post_save, post_delete, pre_delete
+from django.db.models.signals import post_save, pre_delete
 from django.dispatch import receiver
 
 from .models import Cable, Device, VirtualChassis

netbox/dcim/views.py

@@ -16,7 +16,7 @@ from natsort import natsorted
 from circuits.models import Circuit
 from extras.models import Graph, TopologyMap, GRAPH_TYPE_INTERFACE, GRAPH_TYPE_SITE
 from extras.views import ObjectConfigContextView
-from ipam.models import Prefix, Service, VLAN
+from ipam.models import Prefix, VLAN
 from ipam.tables import InterfaceIPAddressTable, InterfaceVLANTable
 from utilities.forms import ConfirmationForm
 from utilities.paginator import EnhancedPaginator
@@ -26,7 +26,6 @@ from utilities.views import (
 )
 from virtualization.models import VirtualMachine
 from . import filters, forms, tables
-from .constants import CONNECTION_STATUS_CONNECTED
 from .models import (
     Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay,
     DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface, InterfaceTemplate,

netbox/extras/api/serializers.py

@@ -7,10 +7,10 @@ from dcim.api.serializers import (
     NestedRegionSerializer, NestedSiteSerializer,
 )
 from dcim.models import Device, DeviceRole, Platform, Rack, Region, Site
+from extras.constants import *
 from extras.models import (
     ConfigContext, ExportTemplate, Graph, ImageAttachment, ObjectChange, ReportResult, TopologyMap,
 )
-from extras.constants import *
 from tenancy.api.serializers import NestedTenantSerializer, NestedTenantGroupSerializer
 from tenancy.models import Tenant, TenantGroup
 from users.api.serializers import NestedUserSerializer

netbox/extras/apps.py

@@ -1,6 +1,6 @@
 from django.apps import AppConfig
-from django.core.exceptions import ImproperlyConfigured
 from django.conf import settings
+from django.core.exceptions import ImproperlyConfigured
 
 
 class ExtrasConfig(AppConfig):

netbox/extras/middleware.py

@@ -1,7 +1,7 @@
-from datetime import timedelta
 import random
 import threading
 import uuid
+from datetime import timedelta
 
 from django.conf import settings
 from django.db.models.signals import post_delete, post_save
@@ -14,7 +14,6 @@ from .constants import (
 )
 from .models import ObjectChange
 
-
 _thread_locals = threading.local()
 
 

netbox/extras/reports.py

@@ -1,7 +1,7 @@
-from collections import OrderedDict
 import importlib
 import inspect
 import pkgutil
+from collections import OrderedDict
 
 from django.conf import settings
 from django.utils import timezone

netbox/extras/webhooks.py

@@ -3,8 +3,8 @@ import datetime
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 
-from extras.models import Webhook
 from extras.constants import OBJECTCHANGE_ACTION_CREATE, OBJECTCHANGE_ACTION_DELETE, OBJECTCHANGE_ACTION_UPDATE
+from extras.models import Webhook
 from utilities.api import get_serializer_for_model
 from .constants import WEBHOOK_MODELS
 

netbox/extras/webhooks_worker.py

@@ -1,8 +1,8 @@
 import hashlib
 import hmac
-import requests
 import json
 
+import requests
 from django_rq import job
 from rest_framework.utils.encoders import JSONEncoder
 

netbox/ipam/fields.py

@@ -2,8 +2,8 @@ from django.core.exceptions import ValidationError
 from django.db import models
 from netaddr import AddrFormatError, IPNetwork
 
-from .formfields import IPFormField
 from . import lookups
+from .formfields import IPFormField
 
 
 def prefix_validator(prefix):

netbox/ipam/filters.py

@@ -1,7 +1,7 @@
 import django_filters
+import netaddr
 from django.core.exceptions import ValidationError
 from django.db.models import Q
-import netaddr
 from netaddr.core import AddrFormatError
 
 from dcim.models import Site, Device, Interface

netbox/ipam/urls.py

@@ -4,7 +4,6 @@ from extras.views import ObjectChangeLogView
 from . import views
 from .models import Aggregate, IPAddress, Prefix, RIR, Role, Service, VLAN, VLANGroup, VRF
 
-
 app_name = 'ipam'
 urlpatterns = [
 

netbox/netbox/admin.py

@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.contrib.admin import AdminSite
-from django.contrib.auth.models import Group, User
 from django.contrib.auth.admin import GroupAdmin, UserAdmin
+from django.contrib.auth.models import Group, User
 from taggit.admin import TagAdmin
 from taggit.models import Tag
 

netbox/netbox/urls.py

@@ -1,8 +1,8 @@
 from django.conf import settings
 from django.conf.urls import include, url
 from django.views.static import serve
-from drf_yasg.views import get_schema_view
 from drf_yasg import openapi
+from drf_yasg.views import get_schema_view
 
 from netbox.views import APIRootView, HomeView, SearchView
 from users.views import LoginView, LogoutView

netbox/netbox/wsgi.py

@@ -2,7 +2,6 @@ import os
 
 from django.core.wsgi import get_wsgi_application
 
-
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "netbox.settings")
 
 application = get_wsgi_application()

netbox/tenancy/views.py

@@ -1,5 +1,5 @@
 from django.contrib.auth.mixins import PermissionRequiredMixin
-from django.db.models import Count, Q
+from django.db.models import Count
 from django.shortcuts import get_object_or_404, render
 from django.views.generic import View
 

netbox/utilities/api.py

@@ -1,6 +1,6 @@
 from collections import OrderedDict
-import pytz
 
+import pytz
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ObjectDoesNotExist

netbox/utilities/fields.py

@@ -3,7 +3,6 @@ from django.db import models
 
 from .forms import ColorSelect
 
-
 ColorValidator = RegexValidator(
     regex='^[0-9a-f]{6}$',
     message='Enter a valid hexadecimal RGB color code.',

netbox/utilities/forms.py

@@ -1,7 +1,7 @@
 import csv
-from io import StringIO
 import json
 import re
+from io import StringIO
 
 from django import forms
 from django.conf import settings

netbox/utilities/management/commands/makemigrations.py

@@ -1,6 +1,7 @@
 # noinspection PyUnresolvedReferences
 from django.core.management.commands.makemigrations import Command
 from django.db import models
+
 from . import custom_deconstruct
 
 models.Field.deconstruct = custom_deconstruct

netbox/utilities/management/commands/migrate.py

@@ -1,6 +1,7 @@
 # noinspection PyUnresolvedReferences
 from django.core.management.commands.migrate import Command
 from django.db import models
+
 from . import custom_deconstruct
 
 models.Field.deconstruct = custom_deconstruct

netbox/utilities/middleware.py

@@ -1,5 +1,3 @@
-import sys
-
 from django.conf import settings
 from django.db import ProgrammingError
 from django.http import Http404, HttpResponseRedirect

netbox/utilities/utils.py

@@ -1,6 +1,5 @@
 import datetime
 import json
-import six
 
 from django.core.serializers import serialize
 from django.http import HttpResponse
@@ -25,7 +24,7 @@ def csv_format(data):
             value = value.isoformat()
 
         # Force conversion to string first so we can check for any commas
-        if not isinstance(value, six.string_types):
+        if not isinstance(value, str):
             value = '{}'.format(value)
 
         # Double-quote the value if it contains a comma

netbox/utilities/views.py

@@ -1,6 +1,6 @@
+import sys
 from collections import OrderedDict
 from copy import deepcopy
-import sys
 
 from django.conf import settings
 from django.contrib import messages
@@ -23,8 +23,8 @@ from django.views.generic import View
 from django_tables2 import RequestConfig
 
 from extras.models import CustomField, CustomFieldValue, ExportTemplate
-from utilities.utils import queryset_to_csv
 from utilities.forms import BootstrapMixin, CSVDataField
+from utilities.utils import queryset_to_csv
 from .error_handlers import handle_protectederror
 from .forms import ConfirmationForm
 from .paginator import EnhancedPaginator