From 9e2ac7b3f4b3009515de0c1bc35660ba1171c2e6 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 16 Jul 2018 17:09:21 -0400 Subject: [PATCH] Cleaned up imports --- netbox/extras/models.py | 2 +- netbox/extras/webhooks.py | 10 ++++------ netbox/extras/webhooks_worker.py | 5 ++--- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/netbox/extras/models.py b/netbox/extras/models.py index 9e1bd2724..512c7906b 100644 --- a/netbox/extras/models.py +++ b/netbox/extras/models.py @@ -8,12 +8,12 @@ from django.contrib.auth.models import User from django.contrib.contenttypes.fields import GenericForeignKey from django.contrib.contenttypes.models import ContentType from django.contrib.postgres.fields import JSONField -from django.urls import reverse from django.core.validators import ValidationError from django.db import models from django.db.models import Q from django.http import HttpResponse from django.template import Template, Context +from django.urls import reverse from django.utils.encoding import python_2_unicode_compatible from django.utils.safestring import mark_safe diff --git a/netbox/extras/webhooks.py b/netbox/extras/webhooks.py index 7f77773c8..ca390a093 100644 --- a/netbox/extras/webhooks.py +++ b/netbox/extras/webhooks.py @@ -1,15 +1,13 @@ import time -from importlib import import_module -from django.db.models.signals import post_save, post_delete from django.conf import settings -from django.core.cache import caches -from django.db.models import Q -from django.dispatch import Signal from django.contrib.contenttypes.models import ContentType +from django.db.models import Q +from django.db.models.signals import post_save, post_delete +from django.dispatch import Signal -from utilities.utils import dynamic_import from extras.models import Webhook +from utilities.utils import dynamic_import def enqueue_webhooks(webhooks, model_class, data, event, signal_received_timestamp): diff --git a/netbox/extras/webhooks_worker.py b/netbox/extras/webhooks_worker.py index 6d346a51f..c764375d7 100644 --- a/netbox/extras/webhooks_worker.py +++ b/netbox/extras/webhooks_worker.py @@ -1,8 +1,7 @@ -import requests -import hmac import hashlib -from rq.utils import import_attribute +import hmac +import requests from django_rq import job from extras.constants import WEBHOOK_CT_JSON, WEBHOOK_CT_X_WWW_FORM_ENCODED