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/modeladmin | |
| parent | da16bb30ff238aa4d59b4186d92ef5429d8d0045 (diff) | |
Imported override_settings from its new location.
Diffstat (limited to 'tests/modeladmin')
| -rw-r--r-- | tests/modeladmin/tests.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/modeladmin/tests.py b/tests/modeladmin/tests.py index 38bfcc25dd..0c7a115fef 100644 --- a/tests/modeladmin/tests.py +++ b/tests/modeladmin/tests.py @@ -13,8 +13,8 @@ from django.contrib.admin import (SimpleListFilter, from django.core.exceptions import ImproperlyConfigured from django.forms.models import BaseModelFormSet from django.forms.widgets import Select -from django.test import TestCase -from django.test.utils import str_prefix, override_settings +from django.test import TestCase, override_settings +from django.test.utils import str_prefix from django.utils import six from .models import Band, Concert, ValidationTestModel, ValidationTestInlineModel |