diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-12-23 16:01:13 +0100 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-12-23 21:37:56 +0100 |
| commit | e32095616c50bef9b06dc8637a99584ba947bae5 (patch) | |
| tree | cf37f3c2201a0ad6053e9f4acf8a7e6c3507e410 /tests/settings_tests | |
| parent | da16bb30ff238aa4d59b4186d92ef5429d8d0045 (diff) | |
| download | django-e32095616c50bef9b06dc8637a99584ba947bae5.tar.gz | |
Imported override_settings from its new location.
Diffstat (limited to 'tests/settings_tests')
| -rw-r--r-- | tests/settings_tests/tests.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/settings_tests/tests.py b/tests/settings_tests/tests.py index fd3f543553..2225862f7f 100644 --- a/tests/settings_tests/tests.py +++ b/tests/settings_tests/tests.py @@ -5,8 +5,8 @@ import warnings from django.conf import settings from django.core.exceptions import ImproperlyConfigured from django.http import HttpRequest -from django.test import SimpleTestCase, TransactionTestCase, TestCase, signals -from django.test.utils import modify_settings, override_settings +from django.test import (SimpleTestCase, TransactionTestCase, TestCase, + modify_settings, override_settings, signals) from django.utils import six |