summaryrefslogtreecommitdiff
path: root/tests/admin_custom_urls
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/admin_custom_urls
parentda16bb30ff238aa4d59b4186d92ef5429d8d0045 (diff)
Imported override_settings from its new location.
Diffstat (limited to 'tests/admin_custom_urls')
-rw-r--r--tests/admin_custom_urls/tests.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/admin_custom_urls/tests.py b/tests/admin_custom_urls/tests.py
index f7a469efe9..d629c78e04 100644
--- a/tests/admin_custom_urls/tests.py
+++ b/tests/admin_custom_urls/tests.py
@@ -3,8 +3,7 @@ from __future__ import unicode_literals
from django.contrib.admin.utils import quote
from django.core.urlresolvers import reverse
from django.template.response import TemplateResponse
-from django.test import TestCase
-from django.test.utils import override_settings
+from django.test import TestCase, override_settings
from .models import Action, Person, Car