Flake8 fixes

Author: kkthxbye-code

netbox_script_manager/__init__.py

@@ -25,6 +25,6 @@ class NetboxScriptManagerConfig(PluginConfig):
 
 # To allow comitting script logs inside the transaction of a running script,
 # we must use a seperate database connection.
-from django.db import connections
+from django.db import connections  # noqa: E402
 
 connections.databases["script_log"] = connections.databases["default"]

netbox_script_manager/api/urls.py

@@ -1,12 +1,6 @@
 from netbox.api.routers import NetBoxRouter
 
-from netbox_script_manager.api.views import (
-    NetBoxScriptManagerView,
-    ScriptArtifactViewSet,
-    ScriptExecutionViewSet,
-    ScriptInstanceViewSet,
-    ScriptLogLineViewSet,
-)
+from netbox_script_manager.api.views import ScriptArtifactViewSet, ScriptExecutionViewSet, ScriptInstanceViewSet, ScriptLogLineViewSet
 
 router = NetBoxRouter()
 # router.APIRootView = NetBoxScriptManagerView

netbox_script_manager/models.py

@@ -123,15 +123,6 @@ class Meta:
             models.Index(fields=["completed"]),
         ]
 
-    def delete(self, *args, **kwargs):
-        super().delete(*args, **kwargs)
-
-        queue = django_rq.get_queue(self.task_queue)
-        job = queue.fetch_job(str(self.task_id))
-
-        if job:
-            job.cancel()
-
     def start(self):
         if self.started is not None:
             return

netbox_script_manager/scripts.py

@@ -1,5 +1,4 @@
 import inspect
-import json
 import logging
 import traceback
 import uuid

netbox_script_manager/templatetags/scriptmanager.py

@@ -22,7 +22,7 @@ def urlencode_dict(value):
     try:
         qd = dict_to_querydict(value)
         return f"?{qd.urlencode()}"
-    except:
+    except Exception:
         return ""
 
 

netbox_script_manager/util.py

@@ -4,7 +4,7 @@
 import threading
 
 from django.conf import settings
-from utilities.utils import copy_safe_request, normalize_querydict
+from utilities.utils import normalize_querydict
 
 # Fields not included when saving script input
 EXCLUDED_POST_FIELDS = ["csrfmiddlewaretoken", "_schedule_at", "_interval", "_run"]

netbox_script_manager/views.py

@@ -150,7 +150,7 @@ def get(self, request):
                 messages.success(request, f'Script "{script_name}" loaded')
 
         if not scripts_found:
-            messages.info(request, f"No new scripts found")
+            messages.info(request, "No new scripts found")
 
         return redirect("plugins:netbox_script_manager:scriptinstance_list")
 

pyproject.toml

@@ -2,9 +2,5 @@
 profile = 'black'
 line_length = 140
 
-[tool.flake8]
-max-line-length = 140
-extend-ignore = ["E203"]
-
 [tool.black]
 line-length = 140

setup.cfg

@@ -13,3 +13,7 @@ replace = __version__ = '{new_version}'
 
 [bdist_wheel]
 universal = 1
+
+[flake8]
+max-line-length = 140
+extend-ignore = E203