Merge branch 'develop' into feature

netbox/users/api/nested_serializers.py

@@ -18,7 +18,7 @@ __all__ = [
 
 # TODO: Remove in v4.2
 warnings.warn(
-    f"Dedicated nested serializers will be removed in NetBox v4.2. Use Serializer(nested=True) instead.",
+    "Dedicated nested serializers will be removed in NetBox v4.2. Use Serializer(nested=True) instead.",
     DeprecationWarning
 )
 

netbox/users/api/views.py

@@ -73,7 +73,7 @@ class TokenProvisionView(APIView):
 
     def perform_create(self, serializer):
         model = serializer.Meta.model
-        logger = logging.getLogger(f'netbox.api.views.TokenProvisionView')
+        logger = logging.getLogger('netbox.api.views.TokenProvisionView')
         logger.info(f"Creating new {model._meta.verbose_name}")
         serializer.save()
 

netbox/users/apps.py

@@ -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())

netbox/users/forms/model_forms.py

@@ -36,7 +36,6 @@ class UserConfigFormMetaclass(forms.models.ModelFormMetaclass):
         # Emulate a declared field for each supported user preference
         preference_fields = {}
         for field_name, preference in PREFERENCES.items():
-            description = f'{preference.description}<br />' if preference.description else ''
             help_text = f'<code>{field_name}</code>'
             if preference.description:
                 help_text = f'{preference.description}<br />{help_text}'

netbox/users/tests/test_preferences.py

@@ -51,11 +51,11 @@ class UserPreferencesTest(TestCase):
 
         # Check that table ordering preference has been recorded
         self.user.refresh_from_db()
-        ordering = self.user.config.get(f'tables.SiteTable.ordering')
+        ordering = self.user.config.get('tables.SiteTable.ordering')
         self.assertEqual(ordering, ['status'])
 
         # Check that a recorded preference is honored by default
-        self.user.config.set(f'tables.SiteTable.ordering', ['-status'], commit=True)
+        self.user.config.set('tables.SiteTable.ordering', ['-status'], commit=True)
         table = SiteTable(Site.objects.all())
         request = RequestFactory().get(url)
         request.user = self.user

netbox/users/tests/test_views.py

@@ -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(