From 657944e1930bc7b1773052755540495bc88e6615 Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@netboxlabs.com>
Date: Fri, 24 Mar 2023 16:26:32 -0400
Subject: [PATCH] Move is_script(), is_report() into extras.utils

---
 netbox/extras/models/models.py |  3 +--
 netbox/extras/temp.py          | 20 --------------------
 netbox/extras/utils.py         | 22 ++++++++++++++++++++++
 3 files changed, 23 insertions(+), 22 deletions(-)
 delete mode 100644 netbox/extras/temp.py

diff --git a/netbox/extras/models/models.py b/netbox/extras/models/models.py
index 9a27c5c7d..14bc3e7d3 100644
--- a/netbox/extras/models/models.py
+++ b/netbox/extras/models/models.py
@@ -26,7 +26,7 @@ from core.models import ManagedFile
 from extras.choices import *
 from extras.constants import *
 from extras.conditions import ConditionSet
-from extras.utils import FeatureQuery, image_upload
+from extras.utils import FeatureQuery, image_upload, is_report, is_script
 from netbox.config import get_config
 from netbox.constants import RQ_QUEUE_DEFAULT
 from netbox.models import ChangeLoggedModel
@@ -34,7 +34,6 @@ from netbox.models.features import (
     CloningMixin, CustomFieldsMixin, CustomLinksMixin, ExportTemplatesMixin, JobResultsMixin, SyncedDataMixin,
     TagsMixin, WebhooksMixin,
 )
-from ..temp import is_report, is_script
 from utilities.querysets import RestrictedQuerySet
 from utilities.rqworker import get_queue_for_model
 from utilities.utils import render_jinja2
diff --git a/netbox/extras/temp.py b/netbox/extras/temp.py
deleted file mode 100644
index 5b07403b0..000000000
--- a/netbox/extras/temp.py
+++ /dev/null
@@ -1,20 +0,0 @@
-def is_script(obj):
-    """
-    Returns True if the object is a Script.
-    """
-    from .scripts import Script
-    try:
-        return issubclass(obj, Script) and obj != Script
-    except TypeError:
-        return False
-
-
-def is_report(obj):
-    """
-    Returns True if the given object is a Report.
-    """
-    from .reports import Report
-    try:
-        return issubclass(obj, Report) and obj != Report
-    except TypeError:
-        return False
diff --git a/netbox/extras/utils.py b/netbox/extras/utils.py
index 70c9427d6..818c6e720 100644
--- a/netbox/extras/utils.py
+++ b/netbox/extras/utils.py
@@ -70,3 +70,25 @@ def register_features(model, features):
             raise KeyError(
                 f"{feature} is not a valid model feature! Valid keys are: {registry['model_features'].keys()}"
             )
+
+
+def is_script(obj):
+    """
+    Returns True if the object is a Script.
+    """
+    from .scripts import Script
+    try:
+        return issubclass(obj, Script) and obj != Script
+    except TypeError:
+        return False
+
+
+def is_report(obj):
+    """
+    Returns True if the given object is a Report.
+    """
+    from .reports import Report
+    try:
+        return issubclass(obj, Report) and obj != Report
+    except TypeError:
+        return False