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
This commit is contained in:
parent
d44fb0557a
commit
4306501da7
|
@ -436,7 +436,6 @@ CACHES = {
|
||||||
}
|
}
|
||||||
# The cache backend to use. See the docstring in django.core.cache for the
|
# The cache backend to use. See the docstring in django.core.cache for the
|
||||||
# possible values.
|
# possible values.
|
||||||
CACHE_BACKEND = 'locmem://'
|
|
||||||
CACHE_MIDDLEWARE_KEY_PREFIX = ''
|
CACHE_MIDDLEWARE_KEY_PREFIX = ''
|
||||||
CACHE_MIDDLEWARE_SECONDS = 600
|
CACHE_MIDDLEWARE_SECONDS = 600
|
||||||
CACHE_MIDDLEWARE_ALIAS = 'default'
|
CACHE_MIDDLEWARE_ALIAS = 'default'
|
||||||
|
|
|
@ -75,11 +75,21 @@ def parse_backend_uri(backend_uri):
|
||||||
return scheme, host, params
|
return scheme, host, params
|
||||||
|
|
||||||
if not settings.CACHES:
|
if not settings.CACHES:
|
||||||
import warnings
|
legacy_backend = getattr(settings, 'CACHE_BACKEND', None)
|
||||||
warnings.warn(
|
if legacy_backend:
|
||||||
"settings.CACHE_* is deprecated; use settings.CACHES instead.",
|
import warnings
|
||||||
PendingDeprecationWarning
|
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
|
# Mapping for new-style cache backend api
|
||||||
backend_classes = {
|
backend_classes = {
|
||||||
'memcached': 'memcached.CacheClass',
|
'memcached': 'memcached.CacheClass',
|
||||||
|
|
Loading…
Reference in New Issue