summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--django/db/models/__init__.py3
-rw-r--r--django/test/utils.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/django/db/models/__init__.py b/django/db/models/__init__.py
index 6c5ccd4bd2..5f17229753 100644
--- a/django/db/models/__init__.py
+++ b/django/db/models/__init__.py
@@ -1,3 +1,5 @@
+from functools import wraps
+
from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured
from django.db.models.loading import get_apps, get_app, get_models, get_model, register_models
from django.db.models.query import Q
@@ -11,7 +13,6 @@ from django.db.models.fields.files import FileField, ImageField
from django.db.models.fields.related import ForeignKey, ForeignObject, OneToOneField, ManyToManyField, ManyToOneRel, ManyToManyRel, OneToOneRel
from django.db.models.deletion import CASCADE, PROTECT, SET, SET_NULL, SET_DEFAULT, DO_NOTHING, ProtectedError
from django.db.models import signals
-from django.utils.decorators import wraps
def permalink(func):
diff --git a/django/test/utils.py b/django/test/utils.py
index d839c0403c..92cef59f72 100644
--- a/django/test/utils.py
+++ b/django/test/utils.py
@@ -1,5 +1,6 @@
import re
import warnings
+from functools import wraps
from xml.dom.minidom import parseString, Node
from django.conf import settings, UserSettingsHolder
@@ -10,7 +11,6 @@ from django.template import Template, loader, TemplateDoesNotExist
from django.template.loaders import cached
from django.test.signals import template_rendered, setting_changed
from django.utils.encoding import force_str
-from django.utils.functional import wraps
from django.utils import six
from django.utils.translation import deactivate