nautobot 2.1.0__py3-none-any.whl → 2.1.1__py3-none-any.whl

nautobot/core/api/parsers.py

@@ -4,13 +4,11 @@ import json
 import logging
 
 from django.conf import settings
-
 from rest_framework import serializers
 from rest_framework.exceptions import ParseError
 from rest_framework.parsers import BaseParser
 
-from nautobot.core.constants import CSV_NULL_TYPE, CSV_NO_OBJECT
-
+from nautobot.core.constants import CSV_NO_OBJECT, CSV_NULL_TYPE
 
 logger = logging.getLogger(__name__)
 

nautobot/core/api/renderers.py

@@ -9,7 +9,6 @@ from rest_framework.renderers import BaseRenderer, BrowsableAPIRenderer, JSONRen
 from nautobot.core.celery import NautobotKombuJSONEncoder
 from nautobot.core.constants import COMPOSITE_KEY_SEPARATOR
 
-
 logger = logging.getLogger(__name__)
 
 

nautobot/core/api/schema.py

@@ -15,7 +15,6 @@ from nautobot.core.api import (
     WritableNestedSerializer,
 )
 
-
 logger = logging.getLogger(__name__)
 
 
@@ -114,7 +113,7 @@ class NautobotAutoSchema(AutoSchema):
             }
 
         # Inject a custom description for the "id" parameter since ours has custom lookup behavior.
-        if "parameters" in operation:
+        if operation is not None and "parameters" in operation:
             for param in operation["parameters"]:
                 if param["name"] == "id" and "description" not in param:
                     param["description"] = "Unique object identifier, either a UUID primary key or a composite key."
@@ -153,7 +152,7 @@ class NautobotAutoSchema(AutoSchema):
             if re.search(r"<drf_format_suffix\w*:\w+>", self.path_regex):
                 tokenized_path.append("formatted")
 
-            return "_".join(tokenized_path + [action])
+            return "_".join([*tokenized_path, action])
 
         # For all other view actions, operation-id is the same as in the base class
         return super().get_operation_id()

nautobot/core/api/serializers.py

@@ -2,6 +2,8 @@ import contextlib
 from copy import deepcopy
 import logging
 import uuid
+
+from django.contrib.contenttypes.fields import GenericRel
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import (
     FieldDoesNotExist,
@@ -10,7 +12,6 @@ from django.core.exceptions import (
     ObjectDoesNotExist,
     ValidationError as DjangoValidationError,
 )
-from django.contrib.contenttypes.fields import GenericRel
 from django.db import models
 from django.db.models.fields.related_descriptors import ManyToManyDescriptor
 from django.db.models.functions import Cast
@@ -18,27 +19,26 @@ from django.urls import NoReverseMatch
 from drf_spectacular.types import OpenApiTypes
 from drf_spectacular.utils import extend_schema_field, PolymorphicProxySerializer as _PolymorphicProxySerializer
 from rest_framework import relations as drf_relations, serializers
-from rest_framework.fields import CreateOnlyDefault
 from rest_framework.exceptions import PermissionDenied, ValidationError
+from rest_framework.fields import CreateOnlyDefault
 from rest_framework.reverse import reverse
 from rest_framework.serializers import SerializerMethodField
-from rest_framework.utils.model_meta import RelationInfo, _get_to_field
-
+from rest_framework.utils.model_meta import _get_to_field, RelationInfo
 
+from nautobot.core import constants
 from nautobot.core.api.fields import NautobotHyperlinkedRelatedField, ObjectTypeField
 from nautobot.core.api.utils import (
     dict_to_filter_params,
     nested_serializer_factory,
 )
-from nautobot.core import constants
 from nautobot.core.exceptions import ViewConfigException
 from nautobot.core.models.managers import TagsManager
 from nautobot.core.models.utils import construct_composite_key, construct_natural_slug
 from nautobot.core.templatetags.helpers import bettertitle
 from nautobot.core.utils.lookup import get_route_for_model
 from nautobot.core.utils.requests import normalize_querydict
+from nautobot.extras.api.customfields import CustomFieldDefaultValues, CustomFieldsDataField
 from nautobot.extras.api.relationships import RelationshipsDataField
-from nautobot.extras.api.customfields import CustomFieldsDataField, CustomFieldDefaultValues
 from nautobot.extras.choices import RelationshipSideChoices
 from nautobot.extras.models import RelationshipAssociation, Tag
 from nautobot.ipam.fields import VarbinaryIPField
@@ -262,7 +262,9 @@ class BaseModelSerializer(OptInFieldsMixin, serializers.HyperlinkedModelSerializ
         fields = [
             field
             for field in model._meta.get_fields()
-            if field.is_relation and not field.many_to_many and not field.one_to_many
+            if field.is_relation
+            and not field.many_to_many
+            and not field.one_to_many
             # Ignore GenericRel since its `fk` and `content_type` would be used.
             and not isinstance(field, GenericRel)
         ]

nautobot/core/api/urls.py

@@ -12,11 +12,9 @@ from nautobot.core.api.views import (
     GetFilterSetFieldLookupExpressionChoicesAPIView,
     GetMenuAPIView,
     GetObjectCountsView,
-    GetSettingsView,
     GraphQLDRFAPIView,
-    NautobotSpectacularSwaggerView,
     NautobotSpectacularRedocView,
-    NewUIReadyRoutesAPIView,
+    NautobotSpectacularSwaggerView,
     StatusView,
 )
 from nautobot.extras.plugins.urls import plugin_api_patterns
@@ -36,10 +34,8 @@ core_api_patterns = [
 ui_api_patterns = [
     # Lookup Expr
     path("core/", include((core_api_patterns, "core-api"))),
-    path("new-ui-ready-routes/", NewUIReadyRoutesAPIView.as_view(), name="new-ui-ready-routes"),
     path("get-menu/", GetMenuAPIView.as_view(), name="get-menu"),
     path("get-object-counts/", GetObjectCountsView.as_view(), name="get-object-counts"),
-    path("settings/", GetSettingsView.as_view(), name="settings"),
 ]
 
 urlpatterns = [

nautobot/core/api/utils.py

@@ -10,11 +10,10 @@ from django.urls import reverse
 from rest_framework import serializers, status
 from rest_framework.utils import formatting
 from rest_framework.utils.field_mapping import get_nested_relation_kwargs
-from rest_framework.utils.model_meta import RelationInfo, _get_to_field
+from rest_framework.utils.model_meta import _get_to_field, RelationInfo
 
 from nautobot.core.api import exceptions
 
-
 logger = logging.getLogger(__name__)
 
 
@@ -216,11 +215,10 @@ def format_output(field, field_value):
         "required": False,  # Form field placeholder
     }
     # TODO: fix these local imports if at all possible
-    from nautobot.core.api import WritableNestedSerializer
-    from rest_framework.fields import CharField
-    from rest_framework.fields import IntegerField
+    from rest_framework.fields import CharField, IntegerField
     from rest_framework.serializers import ListSerializer
-    from nautobot.core.api import ChoiceField
+
+    from nautobot.core.api import ChoiceField, WritableNestedSerializer
 
     kwargs = {}
     if isinstance(field_value, (WritableNestedSerializer, ListSerializer)):

nautobot/core/api/versioning.py

@@ -2,8 +2,8 @@ from django.utils.functional import classproperty
 from django.utils.translation import gettext_lazy as _
 from rest_framework import exceptions
 from rest_framework.compat import unicode_http_header
-from rest_framework.utils.mediatypes import _MediaType
 from rest_framework.settings import api_settings
+from rest_framework.utils.mediatypes import _MediaType
 from rest_framework.versioning import AcceptHeaderVersioning
 
 

nautobot/core/api/views.py

@@ -1,48 +1,45 @@
+from collections import OrderedDict
 import itertools
 import logging
 import platform
-from collections import OrderedDict
-import re
 
 from django import __version__ as DJANGO_VERSION, forms
 from django.apps import apps
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
-from django.http.response import HttpResponseBadRequest
 from django.db import transaction
 from django.db.models import ProtectedError
+from django.http.response import HttpResponseBadRequest
 from django.shortcuts import get_object_or_404, redirect
 from django.urls import NoReverseMatch, reverse as django_reverse
-from rest_framework import status
-from rest_framework.response import Response
-from rest_framework.reverse import reverse
-from rest_framework.views import APIView
-from rest_framework.viewsets import ModelViewSet as ModelViewSet_
-from rest_framework.viewsets import ReadOnlyModelViewSet as ReadOnlyModelViewSet_
-from rest_framework.permissions import AllowAny, IsAuthenticated
-from rest_framework.exceptions import PermissionDenied, ParseError
 from drf_spectacular.plumbing import get_relative_url, set_query_parameters
 from drf_spectacular.renderers import OpenApiJsonRenderer
 from drf_spectacular.utils import extend_schema
-from drf_spectacular.views import SpectacularSwaggerView, SpectacularRedocView
-
+from drf_spectacular.views import SpectacularRedocView, SpectacularSwaggerView
+from graphene_django.settings import graphene_settings
+from graphene_django.views import GraphQLView, HttpError, instantiate_middleware
 from graphql import get_default_backend
 from graphql.execution import ExecutionResult
-from graphql.type.schema import GraphQLSchema
 from graphql.execution.middleware import MiddlewareManager
-from graphene_django.settings import graphene_settings
-from graphene_django.views import GraphQLView, instantiate_middleware, HttpError
+from graphql.type.schema import GraphQLSchema
+from rest_framework import status
+from rest_framework.exceptions import ParseError, PermissionDenied
+from rest_framework.permissions import AllowAny, IsAuthenticated
+from rest_framework.response import Response
+from rest_framework.reverse import reverse
+from rest_framework.views import APIView
+from rest_framework.viewsets import ModelViewSet as ModelViewSet_, ReadOnlyModelViewSet as ReadOnlyModelViewSet_
 
 from nautobot.core.api import BulkOperationSerializer
 from nautobot.core.celery import app as celery_app
 from nautobot.core.exceptions import FilterSetFieldNotFound
-from nautobot.core.utils.config import get_settings_or_config
 from nautobot.core.utils.data import is_uuid
 from nautobot.core.utils.filtering import get_all_lookup_expr_for_field, get_filterset_parameter_form_field
 from nautobot.core.utils.lookup import get_form_for_model, get_route_for_model
 from nautobot.core.utils.permissions import get_permission_for_model
 from nautobot.core.utils.requests import ensure_content_type_and_field_name_in_query_params
 from nautobot.extras.registry import registry
+
 from . import serializers
 
 HTTP_ACTIONS = {
@@ -179,10 +176,11 @@ class ModelViewSetMixin:
         queryset = self.filter_queryset(self.get_queryset())
         lookup_url_kwarg = self.lookup_url_kwarg or self.lookup_field
 
-        assert lookup_url_kwarg in self.kwargs, (
-            f"Expected view {self.__class__.__name__} to be called with a URL keyword argument named "
-            f'"{lookup_url_kwarg}". Fix your URL conf, or set the `.lookup_field` attribute on the view correctly.'
-        )
+        if lookup_url_kwarg not in self.kwargs:
+            raise RuntimeError(
+                f"Expected view {self.__class__.__name__} to be called with a URL keyword argument named "
+                f'"{lookup_url_kwarg}". Fix your URL conf, or set the `.lookup_field` attribute on the view correctly.'
+            )
 
         if lookup_url_kwarg == "pk" and hasattr(queryset.model, "composite_key"):
             # Support lookup by either PK (UUID) or composite_key
@@ -487,7 +485,7 @@ class NautobotSpectacularSwaggerView(APIVersioningGetSchemaURLMixin, Spectacular
 
         format = "openapi"
 
-    renderer_classes = SpectacularSwaggerView.renderer_classes + [FakeOpenAPIRenderer]
+    renderer_classes = [*SpectacularSwaggerView.renderer_classes, FakeOpenAPIRenderer]
 
     template_name = "swagger_ui.html"
 
@@ -602,7 +600,8 @@ class GraphQLDRFAPIView(NautobotAPIVersionMixin, APIView):
         self.executor = self.executor
         self.root_value = self.root_value
 
-        assert isinstance(self.graphql_schema, GraphQLSchema), "A Schema is required to be provided to GraphQLAPIView."
+        if not isinstance(self.graphql_schema, GraphQLSchema):
+            raise ValueError("A Schema is required to be provided to GraphQLAPIView.")
 
     def get_response(self, request, data):
         """Extract the information from the request, execute the GraphQL query and form the response.
@@ -863,42 +862,6 @@ class GetObjectCountsView(NautobotAPIVersionMixin, APIView):
         return Response(object_counts)
 
 
-class GetSettingsView(NautobotAPIVersionMixin, APIView):
-    """
-    This view exposes Nautobot settings.
-
-    Get settings by providing one or more `name` in the query parameters.
-
-    Example:
-
-    - /api/settings/?name=FOO            # Returns the setting with name 'FOO'
-    - /api/settings/?name=FOO&name=BAR   # Returns the setting with these names 'FOO' and 'BAR
-    """
-
-    permission_classes = [IsAuthenticated]
-
-    @extend_schema(exclude=True)
-    def get(self, request):
-        # As of now, we just have `allowed_settings` settings. Because the purpose of this API is limited for the time being,
-        # we may need more access to serializable and non-serializable settings data as the new UI expands. As a result,
-        # exposing all settings data would be desirable in the future.
-        # NOTE: When exposing all settings, include a way to limit settings which can be exposed for security concerns
-        # e.g `SECRET_KEY`, `NAPALM_PASSWORD` e.t.c. also `allowed_settings` can be moved into settings.py
-        allowed_settings = ["FEEDBACK_BUTTON_ENABLED"]
-        # Filter out settings_names not allowed to be exposed to the API
-        valid_settings = [name for name in request.GET.getlist("name") if name in allowed_settings]
-
-        invalid_settings = [name for name in request.GET.getlist("name") if name not in allowed_settings]
-        if invalid_settings:
-            return Response(
-                {"error": f"Invalid settings names specified: {', '.join(invalid_settings)}."},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        res = {settings_name: get_settings_or_config(settings_name) for settings_name in valid_settings}
-        return Response(res)
-
-
 #
 # Lookup Expr
 #
@@ -977,35 +940,3 @@ class GetFilterSetFieldDOMElementAPIView(NautobotAPIVersionMixin, APIView):
         else:
             data = bound_field.as_widget()
         return Response(data)
-
-
-class NewUIReadyRoutesAPIView(NautobotAPIVersionMixin, APIView):
-    """API View that returns a list of new UI-ready routes."""
-
-    permission_classes = [IsAuthenticated]
-
-    def to_javascript_regex(self, regex_pattern):
-        """
-        Convert a Python regex pattern into JavaScript regex format.
-
-        Args:
-            regex_pattern (str): The Python regex pattern to convert.
-
-        Returns:
-            str: The JavaScript-compatible regex pattern.
-        """
-        # Remove named groups (?P<...>)
-        pattern = re.sub(r"\?P<[a-z]+>", "", regex_pattern)
-
-        # Escape `/` with `\`
-        pattern = pattern.replace("/", "\\/")
-
-        # Replace `/Z` with `$`
-        pattern = pattern.replace(r"\Z", "$")
-
-        return pattern
-
-    @extend_schema(exclude=True)
-    def get(self, request):
-        url_regex_patterns = registry["new_ui_ready_routes"]
-        return Response([self.to_javascript_regex(pattern) for pattern in url_regex_patterns])

nautobot/core/apps/__init__.py

@@ -1,18 +1,16 @@
-import logging
-import os
-
 from abc import ABC, abstractmethod
 from collections import OrderedDict
+import logging
+import os
 
+from constance.apps import ConstanceConfig
 from django.apps import AppConfig, apps as global_apps
 from django.contrib.admin.sites import NotRegistered
-from django.db.models import JSONField, BigIntegerField, BinaryField
+from django.db.models import BigIntegerField, BinaryField, JSONField
 from django.db.models.signals import post_migrate
 from django.urls import reverse
 from django.urls.exceptions import NoReverseMatch
 from django.utils.module_loading import import_string
-
-from constance.apps import ConstanceConfig
 from graphene.types import generic, String
 
 from nautobot.core.choices import ButtonActionColorChoices, ButtonActionIconChoices
@@ -20,7 +18,6 @@ from nautobot.core.signals import nautobot_database_ready
 from nautobot.core.utils.navigation import get_all_new_ui_ready_routes
 from nautobot.extras.registry import registry
 
-
 logger = logging.getLogger(__name__)
 registry["nav_menu"] = {"tabs": {}}
 registry["new_ui_nav_menu"] = {}
@@ -816,6 +813,7 @@ class CoreConfig(NautobotConfig):
             library.filter(name=name, fn=func)
 
         from graphene_django.converter import convert_django_field
+
         from nautobot.core.graphql import BigInteger
 
         @convert_django_field.register(JSONField)

nautobot/core/authentication.py

@@ -1,5 +1,5 @@
-import logging
 from collections import defaultdict
+import logging
 
 from django.conf import settings
 from django.contrib.auth.backends import (

nautobot/core/celery/__init__.py

@@ -17,11 +17,10 @@ from django.utils.module_loading import import_string
 from kombu.serialization import register
 from prometheus_client import CollectorRegistry, multiprocess, start_http_server
 
-from nautobot.core.celery.control import discard_git_repository, refresh_git_repository  # noqa: F401
+from nautobot.core.celery.control import discard_git_repository, refresh_git_repository  # noqa: F401  # unused-import
 from nautobot.core.celery.encoders import NautobotKombuJSONEncoder
 from nautobot.core.celery.log import NautobotDatabaseHandler
 
-
 logger = logging.getLogger(__name__)
 # The Celery documentation tells us to call setup on the app to initialize
 # settings, but we will NOT be doing that because of a chicken-and-egg problem

nautobot/core/celery/control.py

@@ -3,10 +3,8 @@ import os
 import shutil
 
 from celery.worker.control import control_command
-
 from django.conf import settings
 
-
 logger = logging.getLogger(__name__)
 
 

nautobot/core/celery/encoders.py

@@ -2,7 +2,6 @@ import logging
 
 from rest_framework.utils.encoders import JSONEncoder
 
-
 logger = logging.getLogger(__name__)
 
 

nautobot/core/celery/schedulers.py

@@ -2,12 +2,11 @@ from collections.abc import Mapping
 import logging
 
 from celery import current_app
-from django_celery_beat.schedulers import ModelEntry, DatabaseScheduler
+from django_celery_beat.schedulers import DatabaseScheduler, ModelEntry
 from kombu.utils.json import loads
 
 from nautobot.extras.models import ScheduledJob, ScheduledJobs
 
-
 logger = logging.getLogger(__name__)
 
 

nautobot/core/celery/task.py

@@ -9,4 +9,4 @@ class NautobotTask(Task):
     """Nautobot extensions to tasks for integrating with Job machinery."""
 
 
-Task = NautobotTask  # noqa: So that the class path resolves.
+Task = NautobotTask  # So that the class path resolves.

nautobot/core/checks.py

@@ -1,12 +1,11 @@
 import re
 
 from django.conf import settings
-from django.core.checks import register, Error, Tags, Warning  # pylint: disable=redefined-builtin
+from django.core.checks import Error, register, Tags, Warning  # pylint: disable=redefined-builtin
 from django.core.exceptions import ValidationError
 from django.core.validators import URLValidator
 from django.db import connections
 
-
 E002 = Error(
     "'nautobot.core.authentication.ObjectPermissionBackend' must be included in AUTHENTICATION_BACKENDS",
     id="nautobot.core.E002",

nautobot/core/choices.py

@@ -43,8 +43,8 @@ class ChoiceSet(metaclass=ChoiceSetMeta):
     Example:
         ```python
         class GreekCapitalLetterChoices(ChoiceSet):
-            ALPHA = "Α"
-            BETA = "Β"
+            ALPHA = "A"
+            BETA = "B"
             GAMMA = "Γ"
 
             CHOICES = (

nautobot/core/cli/__init__.py

@@ -11,7 +11,6 @@ from jinja2 import BaseLoader, Environment
 from nautobot.core.runner import run_app
 from nautobot.extras.plugins.utils import load_plugins
 
-
 # Default file location for the generated config emitted by `init`
 NAUTOBOT_ROOT = os.getenv("NAUTOBOT_ROOT", os.path.expanduser("~/.nautobot"))
 DEFAULT_CONFIG_PATH = os.path.join(NAUTOBOT_ROOT, "nautobot_config.py")
@@ -73,7 +72,8 @@ def generate_settings(config_template=CONFIG_TEMPLATE, **kwargs):
     }
 
     with open(config_template) as fh:
-        environment = Environment(loader=BaseLoader, keep_trailing_newline=True)
+        # We don't need autoescape=True since we control the template file
+        environment = Environment(loader=BaseLoader, keep_trailing_newline=True)  # noqa: S701  # jinja2-autoescape-false
         config = environment.from_string(fh.read())
 
     return config.render(**template_vars)
@@ -115,7 +115,6 @@ def _configure_settings(config):
     os.makedirs(settings.MEDIA_ROOT, exist_ok=True)
     os.makedirs(os.path.join(settings.MEDIA_ROOT, "devicetype-images"), exist_ok=True)
     os.makedirs(os.path.join(settings.MEDIA_ROOT, "image-attachments"), exist_ok=True)
-    os.makedirs(os.path.join(settings.NAUTOBOT_UI_DIR, "build", "static"), exist_ok=True)
     os.makedirs(settings.STATIC_ROOT, exist_ok=True)
 
     #

nautobot/core/context_processors.py

@@ -1,7 +1,6 @@
 from django.conf import settings as django_settings
 
 from nautobot.core.settings_funcs import sso_auth_enabled
-from nautobot.core.utils.navigation import is_route_new_ui_ready
 
 
 def get_saml_idp():
@@ -21,7 +20,7 @@ def get_saml_idp():
     value = ""
     if idp_map is not None:
         try:
-            idp = list(idp_map.keys())[0]
+            idp = next(iter(idp_map.keys()))
         except IndexError:
             pass
         else:
@@ -35,9 +34,6 @@ def settings(request):
     Expose Django settings in the template context. Example: {{ settings.DEBUG }}
     """
     root_template = "base_django.html"
-    if django_settings.ENABLE_ALPHA_UI:
-        use_new_ui = request.COOKIES.get("newui", False) and is_route_new_ui_ready(request.path)
-        root_template = "base_react.html" if use_new_ui else "base_django.html"
     return {
         "settings": django_settings,
         "root_template": root_template,

nautobot/core/factory.py

@@ -1,11 +1,11 @@
 from ipaddress import IPv6Address, IPV6LENGTH, IPv6Network
+import itertools
 
 from django.db.models import Model
 import factory
 from factory.django import DjangoModelFactory
-from faker.providers import BaseProvider
 import factory.random
-import itertools
+from faker.providers import BaseProvider
 
 from nautobot.core import constants
 from nautobot.extras.models import Tag

nautobot/core/filters.py

@@ -634,7 +634,7 @@ class BaseFilterSet(django_filters.FilterSet):
         if getattr(field, "null", None):
             # Use this method vs extend as the `lookup_map` variable is generally one of
             # the constants which we do not want to update
-            lookup_map = dict(lookup_map, **{"isnull": "isnull"})
+            lookup_map = dict(lookup_map, isnull="isnull")
 
         # Create new filters for each lookup expression in the map
         for lookup_name, lookup_expr in lookup_map.items():

nautobot/core/forms/fields.py

@@ -8,15 +8,13 @@ from django.contrib.contenttypes.models import ContentType
 from django.contrib.postgres.forms import SimpleArrayField
 from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist, ValidationError
 from django.db.models import Q
-from django.forms.fields import BoundField, InvalidJSONInput
-from django.forms.fields import JSONField as _JSONField
+from django.forms.fields import BoundField, InvalidJSONInput, JSONField as _JSONField
 from django.urls import reverse
 import django_filters
 from netaddr import EUI
 from netaddr.core import AddrFormatError
 
-from nautobot.core import choices as core_choices
-from nautobot.core import forms
+from nautobot.core import choices as core_choices, forms
 from nautobot.core.forms import widgets
 from nautobot.core.models import validators
 from nautobot.core.utils import data as data_utils, lookup

nautobot/core/forms/forms.py

@@ -7,7 +7,7 @@ from django.forms import formset_factory
 from django.urls import reverse
 import yaml
 
-from nautobot.core.utils.filtering import build_lookup_label, get_filterset_parameter_form_field, get_filter_field_label
+from nautobot.core.utils.filtering import build_lookup_label, get_filter_field_label, get_filterset_parameter_form_field
 from nautobot.ipam import formfields
 
 __all__ = (

nautobot/core/forms/search.py

@@ -1,5 +1,5 @@
-from django.apps import apps
 from django import forms
+from django.apps import apps
 
 from nautobot.core.forms import BootstrapMixin
 

nautobot/core/forms/utils.py

@@ -113,7 +113,7 @@ def add_blank_choice(choices):
     """
     Add a blank choice to the beginning of a choices list.
     """
-    return ((None, "---------"),) + tuple(choices)
+    return ((None, "---------"), *tuple(choices))
 
 
 def form_from_model(model, fields):

nautobot/core/graphql/__init__.py

@@ -1,12 +1,11 @@
 from django.test.client import RequestFactory
-
-from nautobot.extras.models import GraphQLQuery
-
 from graphene.types import Scalar
 from graphene_django.settings import graphene_settings
 from graphql import get_default_backend
 from graphql.language import ast
 
+from nautobot.extras.models import GraphQLQuery
+
 
 def execute_query(query, variables=None, request=None, user=None):
     """Execute a query from the ORM.

nautobot/core/graphql/generators.py

@@ -7,7 +7,7 @@ import graphene_django_optimizer as gql_optimizer
 from graphql import GraphQLError
 
 from nautobot.core.graphql.types import OptimizedNautobotObjectType
-from nautobot.core.graphql.utils import str_to_var_name, get_filtering_args_from_filterset
+from nautobot.core.graphql.utils import get_filtering_args_from_filterset, str_to_var_name
 from nautobot.core.utils.lookup import get_filterset_for_model
 from nautobot.extras.choices import RelationshipSideChoices
 from nautobot.extras.models import RelationshipAssociation