summaryrefslogtreecommitdiff
path: root/django/core/cache/__init__.py
diff options
context:
space:
mode:
authorNick Pope <nick.pope@flightdataservices.com>2017-12-11 12:08:45 +0000
committerTim Graham <timograham@gmail.com>2017-12-11 07:08:45 -0500
commitd13a9e44ded4e93570c6ba42ec84e45ddca2505b (patch)
tree0df16e6538d8794c39bd62b5a46879b8abe6572c /django/core/cache/__init__.py
parenta9e5ac823df8ba8b786b6450c967ca378c008d0e (diff)
Fixed #28909 -- Simplified code using tuple/list/set/dict unpacking.
Diffstat (limited to 'django/core/cache/__init__.py')
-rw-r--r--django/core/cache/__init__.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/django/core/cache/__init__.py b/django/core/cache/__init__.py
index 7aaa057229..349ea86480 100644
--- a/django/core/cache/__init__.py
+++ b/django/core/cache/__init__.py
@@ -44,8 +44,7 @@ def _create_cache(backend, **kwargs):
location = kwargs.pop('LOCATION', '')
params = kwargs
else:
- params = conf.copy()
- params.update(kwargs)
+ params = {**conf, **kwargs}
backend = params.pop('BACKEND')
location = params.pop('LOCATION', '')
backend_cls = import_string(backend)