Closes #1691: Cleaned up and reorganized import statements

netbox/utilities/api.py

@@ -1,17 +1,16 @@
 from __future__ import unicode_literals
+
 from collections import OrderedDict
 
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.http import Http404
-
 from rest_framework.exceptions import APIException
 from rest_framework.permissions import BasePermission
 from rest_framework.response import Response
 from rest_framework.serializers import Field, ModelSerializer, ValidationError
 from rest_framework.viewsets import ViewSet
 
-
 WRITE_OPERATIONS = ['create', 'update', 'partial_update', 'delete']
 
 

netbox/utilities/fields.py

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

netbox/utilities/filters.py

@@ -1,8 +1,8 @@
 from __future__ import unicode_literals
 
-import django_filters
 import itertools
 
+import django_filters
 from django import forms
 from django.utils.encoding import force_text
 

netbox/utilities/forms.py

@@ -1,17 +1,16 @@
 from __future__ import unicode_literals
+
 import csv
 import itertools
 import re
 
-from mptt.forms import TreeNodeMultipleChoiceField
-
 from django import forms
 from django.conf import settings
 from django.urls import reverse_lazy
+from mptt.forms import TreeNodeMultipleChoiceField
 
 from .validators import EnhancedURLValidator
 
-
 COLOR_CHOICES = (
     ('aa1409', 'Dark red'),
     ('f44336', 'Red'),

netbox/utilities/middleware.py

@@ -1,4 +1,5 @@
 from __future__ import unicode_literals
+
 import sys
 
 from django.conf import settings
@@ -7,7 +8,6 @@ from django.http import HttpResponseRedirect
 from django.shortcuts import render
 from django.urls import reverse
 
-
 BASE_PATH = getattr(settings, 'BASE_PATH', False)
 LOGIN_REQUIRED = getattr(settings, 'LOGIN_REQUIRED', False)
 

netbox/utilities/tables.py

@@ -1,7 +1,6 @@
 from __future__ import unicode_literals
 
 import django_tables2 as tables
-
 from django.utils.safestring import mark_safe
 
 

netbox/utilities/templatetags/helpers.py

@@ -1,10 +1,8 @@
 from __future__ import unicode_literals
 
-from markdown import markdown
-
 from django import template
 from django.utils.safestring import mark_safe
-
+from markdown import markdown
 
 register = template.Library()
 

netbox/utilities/utils.py

@@ -1,4 +1,5 @@
 from __future__ import unicode_literals
+
 import six
 
 

netbox/utilities/validators.py

@@ -1,4 +1,5 @@
 from __future__ import unicode_literals
+
 import re
 
 from django.core.validators import _lazy_re_compile, URLValidator

netbox/utilities/views.py

@@ -1,9 +1,8 @@
 from __future__ import unicode_literals
+
 from collections import OrderedDict
 from copy import deepcopy
 
-from django_tables2 import RequestConfig
-
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.contenttypes.models import ContentType
@@ -19,6 +18,7 @@ from django.utils.html import escape
 from django.utils.http import is_safe_url
 from django.utils.safestring import mark_safe
 from django.views.generic import View
+from django_tables2 import RequestConfig
 
 from extras.models import CustomField, CustomFieldValue, ExportTemplate, UserAction
 from utilities.forms import BootstrapMixin, CSVDataField