Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closes #17725: Clean up import statements #17728

Merged
merged 2 commits into from
Oct 10, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion netbox/circuits/apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class CircuitsConfig(AppConfig):

def ready(self):
from netbox.models.features import register_models
from . import signals, search
from . import signals, search # noqa: F401

# Register models
register_models(*self.get_models())
1 change: 0 additions & 1 deletion netbox/circuits/forms/bulk_import.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from django import forms
from django.utils.safestring import mark_safe
from django.utils.translation import gettext_lazy as _

from circuits.choices import *
Expand Down
3 changes: 1 addition & 2 deletions netbox/circuits/graphql/filters.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import strawberry
import strawberry_django
from circuits import filtersets, models

from circuits import filtersets, models
from netbox.graphql.filter_mixins import autotype_decorator, BaseFilterMixin

__all__ = (
Expand Down
4 changes: 1 addition & 3 deletions netbox/core/api/schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@
build_basic_type, build_choice_field, build_media_type_object, build_object_type, get_doc,
)
from drf_spectacular.types import OpenApiTypes
from rest_framework import serializers
from rest_framework.relations import ManyRelatedField

from netbox.api.fields import ChoiceField, SerializedPKRelatedField
from netbox.api.fields import ChoiceField
from netbox.api.serializers import WritableNestedSerializer

# see netbox.api.routers.NetBoxRouter
Expand Down
2 changes: 0 additions & 2 deletions netbox/core/api/serializers_/jobs.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from rest_framework import serializers

from core.choices import *
from core.models import Job
from netbox.api.fields import ChoiceField, ContentTypeField
Expand Down
4 changes: 2 additions & 2 deletions netbox/core/apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ class CoreConfig(AppConfig):
name = "core"

def ready(self):
from core.api import schema # noqa
from core.api import schema # noqa: F401
from netbox.models.features import register_models
from . import data_backends, events, search
from . import data_backends, events, search # noqa: F401

# Register models
register_models(*self.get_models())
2 changes: 0 additions & 2 deletions netbox/dcim/api/serializers_/manufacturers.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from rest_framework import serializers

from dcim.models import Manufacturer
from netbox.api.fields import RelatedObjectCountField
from netbox.api.serializers import NetBoxModelSerializer
Expand Down
2 changes: 0 additions & 2 deletions netbox/dcim/api/serializers_/platforms.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from rest_framework import serializers

from dcim.models import Platform
from extras.api.serializers_.configtemplates import ConfigTemplateSerializer
from netbox.api.fields import RelatedObjectCountField
Expand Down
2 changes: 0 additions & 2 deletions netbox/dcim/api/serializers_/power.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from rest_framework import serializers

from dcim.choices import *
from dcim.models import PowerFeed, PowerPanel
from netbox.api.fields import ChoiceField, RelatedObjectCountField
Expand Down
2 changes: 0 additions & 2 deletions netbox/dcim/api/serializers_/roles.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from rest_framework import serializers

from dcim.models import DeviceRole, InventoryItemRole
from extras.api.serializers_.configtemplates import ConfigTemplateSerializer
from netbox.api.fields import RelatedObjectCountField
Expand Down
2 changes: 1 addition & 1 deletion netbox/dcim/apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class DCIMConfig(AppConfig):
def ready(self):
from netbox.models.features import register_models
from utilities.counters import connect_counters
from . import signals, search
from . import signals, search # noqa: F401
from .models import CableTermination, Device, DeviceType, VirtualChassis

# Register models
Expand Down
2 changes: 1 addition & 1 deletion netbox/dcim/forms/connections.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from circuits.models import Circuit, CircuitTermination
from dcim.models import *
from utilities.forms.fields import DynamicModelChoiceField, DynamicModelMultipleChoiceField
from utilities.forms.fields import DynamicModelMultipleChoiceField
from .model_forms import CableForm


Expand Down
1 change: 0 additions & 1 deletion netbox/dcim/graphql/mixins.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from typing import Annotated, List, Union

import strawberry
import strawberry_django

__all__ = (
'CabledObjectMixin',
Expand Down
3 changes: 1 addition & 2 deletions netbox/dcim/models/device_components.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from django.core.exceptions import ValidationError
from django.core.validators import MaxValueValidator, MinValueValidator
from django.db import models
from django.db.models import F, Sum
from django.db.models import Sum
from django.urls import reverse
from django.utils.translation import gettext_lazy as _
from mptt.models import MPTTModel, TreeForeignKey
Expand All @@ -22,7 +22,6 @@
from wireless.choices import *
from wireless.utils import get_channel_attr


__all__ = (
'BaseInterface',
'CabledObjectModel',
Expand Down
2 changes: 0 additions & 2 deletions netbox/dcim/utils.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import itertools

from django.contrib.contenttypes.models import ContentType
from django.db import transaction

Expand Down
2 changes: 0 additions & 2 deletions netbox/extras/api/serializers_/configtemplates.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from rest_framework import serializers

from core.api.serializers_.data import DataFileSerializer, DataSourceSerializer
from extras.models import ConfigTemplate
from netbox.api.serializers import ValidatedModelSerializer
Expand Down
2 changes: 0 additions & 2 deletions netbox/extras/api/serializers_/customlinks.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from rest_framework import serializers

from core.models import ObjectType
from extras.models import CustomLink
from netbox.api.fields import ContentTypeField
Expand Down
2 changes: 0 additions & 2 deletions netbox/extras/api/serializers_/exporttemplates.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from rest_framework import serializers

from core.api.serializers_.data import DataFileSerializer, DataSourceSerializer
from core.models import ObjectType
from extras.models import ExportTemplate
Expand Down
2 changes: 0 additions & 2 deletions netbox/extras/api/serializers_/savedfilters.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from rest_framework import serializers

from core.models import ObjectType
from extras.models import SavedFilter
from netbox.api.fields import ContentTypeField
Expand Down
2 changes: 0 additions & 2 deletions netbox/extras/api/serializers_/tags.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from rest_framework import serializers

from core.models import ObjectType
from extras.models import Tag
from netbox.api.fields import ContentTypeField, RelatedObjectCountField
Expand Down
3 changes: 1 addition & 2 deletions netbox/extras/api/views.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from django.http import Http404
from django.shortcuts import get_object_or_404
from django.utils.module_loading import import_string
from django_rq.queues import get_connection
from drf_spectacular.utils import extend_schema, extend_schema_view
from rest_framework import status
Expand All @@ -15,8 +14,8 @@

from core.models import ObjectType
from extras import filtersets
from extras.models import *
from extras.jobs import ScriptJob
from extras.models import *
from netbox.api.authentication import IsAuthenticatedOrLoginNotRequired
from netbox.api.features import SyncedDataMixin
from netbox.api.metadata import ContentTypeMetadata
Expand Down
2 changes: 1 addition & 1 deletion netbox/extras/apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class ExtrasConfig(AppConfig):

def ready(self):
from netbox.models.features import register_models
from . import dashboard, lookups, search, signals
from . import dashboard, lookups, search, signals # noqa: F401

# Register models
register_models(*self.get_models())
1 change: 0 additions & 1 deletion netbox/extras/dashboard/widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

from core.models import ObjectType
from extras.choices import BookmarkOrderingChoices
from netbox.choices import ButtonColorChoices
from utilities.object_types import object_type_identifier, object_type_name
from utilities.permissions import get_permission_for_model
from utilities.querydict import dict_to_querydict
Expand Down
3 changes: 2 additions & 1 deletion netbox/extras/lookups.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.db.models import CharField, TextField, Lookup
from django.db.models import CharField, Lookup

from .fields import CachedValueField


Expand Down
2 changes: 0 additions & 2 deletions netbox/extras/tests/test_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
from extras.choices import *
from extras.models import *
from extras.scripts import BooleanVar, IntegerVar, Script as PythonClass, StringVar
from netbox.events import *
from users.models import Group, User
from utilities.testing import APITestCase, APIViewTestCases

Expand Down Expand Up @@ -793,7 +792,6 @@ def setUp(self):
super().setUp()

# Monkey-patch the Script model to return our TestScriptClass above
from extras.api.views import ScriptViewSet
Script.python_class = self.python_class

def test_get_script(self):
Expand Down
1 change: 0 additions & 1 deletion netbox/extras/validators.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import inspect
import operator

from django.core import validators
Expand Down
3 changes: 1 addition & 2 deletions netbox/extras/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
from django.http import HttpResponseBadRequest, HttpResponseForbidden, HttpResponse
from django.shortcuts import get_object_or_404, redirect, render
from django.urls import reverse
from django.utils.module_loading import import_string
from django.utils import timezone
from django.utils.module_loading import import_string
from django.utils.translation import gettext as _
from django.views.generic import View

Expand All @@ -20,7 +20,6 @@
from extras.dashboard.forms import DashboardWidgetAddForm, DashboardWidgetForm
from extras.dashboard.utils import get_widget_class
from netbox.constants import DEFAULT_ACTION_PERMISSIONS
from netbox.registry import registry
from netbox.views import generic
from netbox.views.generic.mixins import TableMixin
from utilities.forms import ConfirmationForm, get_field_value
Expand Down
2 changes: 0 additions & 2 deletions netbox/ipam/api/serializers_/roles.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from rest_framework import serializers

from ipam.models import Role
from netbox.api.fields import RelatedObjectCountField
from netbox.api.serializers import NetBoxModelSerializer
Expand Down
2 changes: 0 additions & 2 deletions netbox/ipam/api/serializers_/services.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from rest_framework import serializers

from dcim.api.serializers_.devices import DeviceSerializer
from ipam.choices import *
from ipam.models import IPAddress, Service, ServiceTemplate
Expand Down
2 changes: 0 additions & 2 deletions netbox/ipam/api/serializers_/vrfs.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from rest_framework import serializers

from ipam.models import RouteTarget, VRF
from netbox.api.fields import RelatedObjectCountField, SerializedPKRelatedField
from netbox.api.serializers import NetBoxModelSerializer
Expand Down
2 changes: 1 addition & 1 deletion netbox/ipam/apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class IPAMConfig(AppConfig):

def ready(self):
from netbox.models.features import register_models
from . import signals, search
from . import signals, search # noqa: F401

# Register models
register_models(*self.get_models())
1 change: 0 additions & 1 deletion netbox/ipam/graphql/mixins.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from typing import Annotated, List

import strawberry
import strawberry_django

__all__ = (
'IPAddressesMixin',
Expand Down
2 changes: 0 additions & 2 deletions netbox/netbox/api/serializers/nested.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from rest_framework import serializers

from extras.models import Tag
from utilities.api import get_related_object_by_attrs
from .base import BaseModelSerializer
Expand Down
1 change: 0 additions & 1 deletion netbox/netbox/plugins/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
from django.apps import apps
from django.conf import settings
from django.conf.urls import include
from django.contrib.admin.views.decorators import staff_member_required
from django.urls import path
from django.utils.module_loading import import_string, module_has_submodule

Expand Down
2 changes: 0 additions & 2 deletions netbox/netbox/plugins/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@

from django.apps import apps
from django.conf import settings
from django.shortcuts import render
from django.urls.exceptions import NoReverseMatch
from django.views.generic import View
from drf_spectacular.utils import extend_schema
from rest_framework import permissions
from rest_framework.response import Response
Expand Down
6 changes: 2 additions & 4 deletions netbox/netbox/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,12 @@
import platform
import sys
import warnings
from urllib.parse import urlencode, urlsplit
from urllib.parse import urlencode

import django
import requests
from django.contrib.messages import constants as messages
from django.core.exceptions import ImproperlyConfigured, ValidationError
from django.core.validators import URLValidator
from django.utils.encoding import force_str
from django.utils.translation import gettext_lazy as _

from netbox.config import PARAMS as CONFIG_PARAMS
Expand Down Expand Up @@ -252,7 +250,7 @@ def _setting(name, default=None):
# django-storage-swift
elif STORAGE_BACKEND == 'swift.storage.SwiftStorage':
try:
import swift.utils # type: ignore
import swift.utils # noqa: F401
except ModuleNotFoundError as e:
if getattr(e, 'name') == 'swift':
raise ImproperlyConfigured(
Expand Down
2 changes: 1 addition & 1 deletion netbox/netbox/tests/dummy_plugin/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from utilities.views import register_model_view
from .models import DummyModel
# Trigger registration of custom column
from .tables import mycol
from .tables import mycol # noqa: F401


class DummyModelsView(View):
Expand Down
2 changes: 1 addition & 1 deletion netbox/tenancy/apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class TenancyConfig(AppConfig):

def ready(self):
from netbox.models.features import register_models
from . import search
from . import search # noqa: F401

# Register models
register_models(*self.get_models())
1 change: 0 additions & 1 deletion netbox/tenancy/filtersets.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
from django.db.models import Q
from django.utils.translation import gettext as _

from extras.filters import TagFilter
from netbox.filtersets import NetBoxModelFilterSet, OrganizationalModelFilterSet
from utilities.filters import ContentTypeFilter, TreeNodeMultipleChoiceFilter
from .models import *
Expand Down
2 changes: 0 additions & 2 deletions netbox/tenancy/graphql/mixins.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
from typing import Annotated, List

import strawberry
import strawberry_django


__all__ = (
'ContactAssignmentsMixin',
Expand Down
2 changes: 1 addition & 1 deletion netbox/users/apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class UsersConfig(AppConfig):

def ready(self):
from netbox.models.features import register_models
from . import signals
from . import signals # noqa: F401

# Register models
register_models(*self.get_models())
4 changes: 1 addition & 3 deletions netbox/users/tests/test_views.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
from django.test import override_settings

from core.models import ObjectType
from users.models import *
from utilities.testing import ViewTestCases, create_test_user, extract_form_failures
from utilities.testing import ViewTestCases, create_test_user


class UserTestCase(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from collections import defaultdict

from django.core.management.base import BaseCommand
from django.db.models import Count, OuterRef, Subquery

from netbox.registry import registry
from utilities.counters import update_counts
Expand Down
2 changes: 1 addition & 1 deletion netbox/utilities/markdown.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class StrikethroughExtension(markdown.Extension):
"""
def extendMarkdown(self, md):
md.inlinePatterns.register(
markdown.inlinepatterns.SimpleTagPattern(STRIKE_RE, 'del'),
SimpleTagPattern(STRIKE_RE, 'del'),
'strikethrough',
200
)
Loading