diff options
Diffstat (limited to 'django/core/cache/__init__.py')
| -rw-r--r-- | django/core/cache/__init__.py | 37 |
1 files changed, 10 insertions, 27 deletions
diff --git a/django/core/cache/__init__.py b/django/core/cache/__init__.py index ed72fe88e1..b4bb2086c5 100644 --- a/django/core/cache/__init__.py +++ b/django/core/cache/__init__.py @@ -29,31 +29,6 @@ __all__ = [ DEFAULT_CACHE_ALIAS = 'default' -def _create_cache(backend, **kwargs): - try: - # Try to get the CACHES entry for the given backend name first - try: - conf = settings.CACHES[backend] - except KeyError: - try: - # Trying to import the given backend, in case it's a dotted path - import_string(backend) - except ImportError as e: - raise InvalidCacheBackendError("Could not find backend '%s': %s" % ( - backend, e)) - location = kwargs.pop('LOCATION', '') - params = kwargs - else: - params = {**conf, **kwargs} - backend = params.pop('BACKEND') - location = params.pop('LOCATION', '') - backend_cls = import_string(backend) - except ImportError as e: - raise InvalidCacheBackendError( - "Could not find backend '%s': %s" % (backend, e)) - return backend_cls(location, params) - - class CacheHandler: """ A Cache Handler to manage access to Cache instances. @@ -75,8 +50,16 @@ class CacheHandler: raise InvalidCacheBackendError( "Could not find config for '%s' in settings.CACHES" % alias ) - - cache = _create_cache(alias) + params = settings.CACHES[alias].copy() + backend = params.pop('BACKEND') + location = params.pop('LOCATION', '') + try: + backend_cls = import_string(backend) + except ImportError as e: + raise InvalidCacheBackendError( + "Could not find backend '%s': %s" % (backend, e) + ) + cache = backend_cls(location, params) self._caches.caches[alias] = cache return cache |