summaryrefslogtreecommitdiff
path: root/tests/wsgi
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/wsgi
parentda16bb30ff238aa4d59b4186d92ef5429d8d0045 (diff)
downloaddjango-e32095616c50bef9b06dc8637a99584ba947bae5.tar.gz
Imported override_settings from its new location.
Diffstat (limited to 'tests/wsgi')
-rw-r--r--tests/wsgi/tests.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/wsgi/tests.py b/tests/wsgi/tests.py
index 90397bb742..567ca94f98 100644
--- a/tests/wsgi/tests.py
+++ b/tests/wsgi/tests.py
@@ -7,9 +7,8 @@ from django.core.servers.basehttp import get_internal_wsgi_application
from django.core.signals import request_started
from django.core.wsgi import get_wsgi_application
from django.db import close_old_connections
-from django.test import TestCase
+from django.test import TestCase, override_settings
from django.test.client import RequestFactory
-from django.test.utils import override_settings
from django.utils import six