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/cache | |
| parent | da16bb30ff238aa4d59b4186d92ef5429d8d0045 (diff) | |
Imported override_settings from its new location.
Diffstat (limited to 'tests/cache')
| -rw-r--r-- | tests/cache/tests.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/cache/tests.py b/tests/cache/tests.py index 12e75e24b7..e17bad1523 100644 --- a/tests/cache/tests.py +++ b/tests/cache/tests.py @@ -23,8 +23,8 @@ from django.middleware.cache import (FetchFromCacheMiddleware, UpdateCacheMiddleware, CacheMiddleware) from django.template import Template from django.template.response import TemplateResponse -from django.test import TestCase, TransactionTestCase, RequestFactory -from django.test.utils import (override_settings, IgnoreDeprecationWarningsMixin, +from django.test import TestCase, TransactionTestCase, RequestFactory, override_settings +from django.test.utils import (IgnoreDeprecationWarningsMixin, IgnorePendingDeprecationWarningsMixin) from django.utils import six from django.utils import timezone |