summaryrefslogtreecommitdiff
path: root/tests/utils_tests/test_dateformat.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/utils_tests/test_dateformat.py
parentda16bb30ff238aa4d59b4186d92ef5429d8d0045 (diff)
Imported override_settings from its new location.
Diffstat (limited to 'tests/utils_tests/test_dateformat.py')
-rw-r--r--tests/utils_tests/test_dateformat.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/utils_tests/test_dateformat.py b/tests/utils_tests/test_dateformat.py
index ebf46f3ee7..c0b42db3dc 100644
--- a/tests/utils_tests/test_dateformat.py
+++ b/tests/utils_tests/test_dateformat.py
@@ -3,8 +3,7 @@ from __future__ import unicode_literals
from datetime import datetime, date
import time
-from django.test import TestCase
-from django.test.utils import override_settings
+from django.test import TestCase, override_settings
from django.utils.dateformat import format
from django.utils import dateformat
from django.utils.timezone import utc, get_fixed_timezone, get_default_timezone, make_aware