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/cache/tests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/cache') 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 -- cgit v1.3