summaryrefslogtreecommitdiff
path: root/django/core/cache
diff options
context:
space:
mode:
Diffstat (limited to 'django/core/cache')
-rw-r--r--django/core/cache/__init__.py20
1 files changed, 15 insertions, 5 deletions
diff --git a/django/core/cache/__init__.py b/django/core/cache/__init__.py
index ced9875b07..2c75f6c671 100644
--- a/django/core/cache/__init__.py
+++ b/django/core/cache/__init__.py
@@ -75,11 +75,21 @@ def parse_backend_uri(backend_uri):
return scheme, host, params
if not settings.CACHES:
- import warnings
- warnings.warn(
- "settings.CACHE_* is deprecated; use settings.CACHES instead.",
- PendingDeprecationWarning
- )
+ 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',