From e32095616c50bef9b06dc8637a99584ba947bae5 Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Mon, 23 Dec 2013 16:01:13 +0100 Subject: Imported override_settings from its new location. --- tests/forms_tests/tests/test_extra.py | 3 +-- tests/forms_tests/tests/test_input_formats.py | 2 +- tests/forms_tests/tests/test_media.py | 3 +-- tests/forms_tests/tests/test_widgets.py | 3 +-- 4 files changed, 4 insertions(+), 7 deletions(-) (limited to 'tests/forms_tests') diff --git a/tests/forms_tests/tests/test_extra.py b/tests/forms_tests/tests/test_extra.py index 7988b52da4..100c655117 100644 --- a/tests/forms_tests/tests/test_extra.py +++ b/tests/forms_tests/tests/test_extra.py @@ -12,8 +12,7 @@ from django.forms import ( ) from django.forms.extras import SelectDateWidget from django.forms.utils import ErrorList -from django.test import TestCase -from django.test.utils import override_settings +from django.test import TestCase, override_settings from django.utils import six from django.utils import translation from django.utils.dates import MONTHS_AP diff --git a/tests/forms_tests/tests/test_input_formats.py b/tests/forms_tests/tests/test_input_formats.py index b9c29c7609..f939821c75 100644 --- a/tests/forms_tests/tests/test_input_formats.py +++ b/tests/forms_tests/tests/test_input_formats.py @@ -1,7 +1,7 @@ from datetime import time, date, datetime from django import forms -from django.test.utils import override_settings +from django.test import override_settings from django.utils.translation import activate, deactivate from django.test import SimpleTestCase diff --git a/tests/forms_tests/tests/test_media.py b/tests/forms_tests/tests/test_media.py index 492655505c..c44e443eac 100644 --- a/tests/forms_tests/tests/test_media.py +++ b/tests/forms_tests/tests/test_media.py @@ -1,8 +1,7 @@ # -*- coding: utf-8 -*- from django.forms import Media, TextInput, CharField, Form, MultiWidget from django.template import Template, Context -from django.test import TestCase -from django.test.utils import override_settings +from django.test import TestCase, override_settings @override_settings( diff --git a/tests/forms_tests/tests/test_widgets.py b/tests/forms_tests/tests/test_widgets.py index 21134d1a24..4bbed3f0a9 100644 --- a/tests/forms_tests/tests/test_widgets.py +++ b/tests/forms_tests/tests/test_widgets.py @@ -18,8 +18,7 @@ from django.forms.widgets import RadioFieldRenderer from django.utils.safestring import mark_safe from django.utils import six from django.utils.translation import activate, deactivate, override -from django.test import TestCase -from django.test.utils import override_settings +from django.test import TestCase, override_settings from django.utils.encoding import python_2_unicode_compatible, force_text from ..models import Article -- cgit v1.3