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/defer_regress | |
| parent | da16bb30ff238aa4d59b4186d92ef5429d8d0045 (diff) | |
| download | django-e32095616c50bef9b06dc8637a99584ba947bae5.tar.gz | |
Imported override_settings from its new location.
Diffstat (limited to 'tests/defer_regress')
| -rw-r--r-- | tests/defer_regress/tests.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/defer_regress/tests.py b/tests/defer_regress/tests.py index 442af9f7cf..b12b3b61b0 100644 --- a/tests/defer_regress/tests.py +++ b/tests/defer_regress/tests.py @@ -6,8 +6,7 @@ from django.apps import app_cache from django.contrib.contenttypes.models import ContentType from django.contrib.sessions.backends.db import SessionStore from django.db.models import Count -from django.test import TestCase -from django.test.utils import override_settings +from django.test import TestCase, override_settings from .models import ( ResolveThis, Item, RelatedItem, Child, Leaf, Proxy, SimpleItem, Feature, |