summaryrefslogtreecommitdiff
path: root/tests/staticfiles_tests/test_liveserver.py
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/staticfiles_tests/test_liveserver.py
parentda16bb30ff238aa4d59b4186d92ef5429d8d0045 (diff)
Imported override_settings from its new location.
Diffstat (limited to 'tests/staticfiles_tests/test_liveserver.py')
-rw-r--r--tests/staticfiles_tests/test_liveserver.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/staticfiles_tests/test_liveserver.py b/tests/staticfiles_tests/test_liveserver.py
index 6fa64240cc..b7e309e1a7 100644
--- a/tests/staticfiles_tests/test_liveserver.py
+++ b/tests/staticfiles_tests/test_liveserver.py
@@ -7,7 +7,7 @@ django.test.LiveServerTestCase.
import os
from django.core.exceptions import ImproperlyConfigured
-from django.test.utils import override_settings
+from django.test import override_settings
from django.utils.six.moves.urllib.request import urlopen
from django.utils._os import upath