From 8dd41b771ee89f17c0be40eeb05451079657c07f Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 16 Jul 2020 11:54:08 -0400 Subject: [PATCH] Update import locations for Django 3.1 --- netbox/extras/scripts.py | 2 +- netbox/utilities/forms.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/extras/scripts.py b/netbox/extras/scripts.py index dd096c392..9c8ef7b09 100644 --- a/netbox/extras/scripts.py +++ b/netbox/extras/scripts.py @@ -11,7 +11,7 @@ from django import forms from django.conf import settings from django.core.validators import RegexValidator from django.db import transaction -from django.utils.decorators import classproperty +from django.utils.functional import classproperty from django_rq import job from extras.api.serializers import ScriptOutputSerializer diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py index 5c4b58213..0e1768387 100644 --- a/netbox/utilities/forms.py +++ b/netbox/utilities/forms.py @@ -8,7 +8,7 @@ import yaml from django import forms from django.conf import settings from django.contrib.postgres.forms import SimpleArrayField -from django.contrib.postgres.forms.jsonb import JSONField as _JSONField, InvalidJSONInput +from django.forms.fields import JSONField as _JSONField, InvalidJSONInput from django.core.exceptions import MultipleObjectsReturned from django.db.models import Count from django.forms import BoundField