summaryrefslogtreecommitdiff
path: root/tests/proxy_models
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-12-23 16:01:13 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-12-23 21:37:56 +0100
commite32095616c50bef9b06dc8637a99584ba947bae5 (patch)
treecf37f3c2201a0ad6053e9f4acf8a7e6c3507e410 /tests/proxy_models
parentda16bb30ff238aa4d59b4186d92ef5429d8d0045 (diff)
Imported override_settings from its new location.
Diffstat (limited to 'tests/proxy_models')
-rw-r--r--tests/proxy_models/tests.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/proxy_models/tests.py b/tests/proxy_models/tests.py
index 800fc42e6d..346924e320 100644
--- a/tests/proxy_models/tests.py
+++ b/tests/proxy_models/tests.py
@@ -7,8 +7,7 @@ from django.core import management
from django.core.exceptions import FieldError
from django.db import models, DEFAULT_DB_ALIAS
from django.db.models import signals
-from django.test import TestCase
-from django.test.utils import override_settings
+from django.test import TestCase, override_settings
from .models import (MyPerson, Person, StatusPerson, LowerStatusPerson,