Fixed #15217 -- Made the CACHE_BACKEND deprecation warning more selective, so it…

Fixed #15217 -- Made the CACHE_BACKEND deprecation warning more selective, so it doesn't catch the default case. Thanks to adamv for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15406 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django/conf/global_settings.py

@@ -436,7 +436,6 @@ CACHES = {
 }
 # The cache backend to use.  See the docstring in django.core.cache for the
 # possible values.
-CACHE_BACKEND = 'locmem://'
 CACHE_MIDDLEWARE_KEY_PREFIX = ''
 CACHE_MIDDLEWARE_SECONDS = 600
 CACHE_MIDDLEWARE_ALIAS = 'default'

django/core/cache/__init__.py

@@ -75,11 +75,21 @@ def parse_backend_uri(backend_uri):
     return scheme, host, params
 
 if not settings.CACHES:
+    legacy_backend = getattr(settings, 'CACHE_BACKEND', None)
+    if legacy_backend:
         import warnings
         warnings.warn(
             "settings.CACHE_* is deprecated; use settings.CACHES instead.",
             PendingDeprecationWarning
         )
+    else:
+        # The default cache setting is put here so that we
+        # can differentiate between a user who has provided
+        # an explicit CACHE_BACKEND of locmem://, and the
+        # default value. When the deprecation cycle has completed,
+        # the default can be restored to global_settings.py
+        settings.CACHE_BACKEND = 'locmem://'
+
     # Mapping for new-style cache backend api
     backend_classes = {
         'memcached': 'memcached.CacheClass',