p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[2.0.x] Fixed #28601 -- Prevented cache.get_or_set() from caching None if default is a callable that returns None. 

Backport of 4d60261b2a from master
This commit is contained in:
Daniel Tao 2017-09-15 16:16:44 -05:00 committed by Tim Graham
parent d3e115151e
commit dc112bf530
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
django/core/cache/backends/base.py vendored
View File

@ -155,13 +155,15 @@ class BaseCache:
Return the value of the key stored or retrieved. Return the value of the key stored or retrieved.
""" """
val = self.get(key, version=version) val = self.get(key, version=version)
if val is None and default is not None: if val is None:
if callable(default): if callable(default):
default = default() default = default()
self.add(key, default, timeout=timeout, version=version) if default is not None:
# Fetch the value again to avoid a race condition if another caller self.add(key, default, timeout=timeout, version=version)
# added a value between the first get() and the add() above. # Fetch the value again to avoid a race condition if another
return self.get(key, default, version=version) # caller added a value between the first get() and the add()
# above.
return self.get(key, default, version=version)
return val return val
def has_key(self, key, version=None): def has_key(self, key, version=None):

3
docs/releases/1.11.7.txt
View File

@ -9,4 +9,5 @@ Django 1.11.7 fixes several bugs in 1.11.6.
Bugfixes Bugfixes
======== ========
* ... * Prevented ``cache.get_or_set()`` from caching ``None`` if the ``default``
argument is a callable that returns ``None`` (:ticket:`28601`).

5
tests/cache/tests.py vendored
View File

@ -926,6 +926,11 @@ class BaseCacheTests:
self.assertEqual(cache.get_or_set('mykey', my_callable), 'value') self.assertEqual(cache.get_or_set('mykey', my_callable), 'value')
self.assertEqual(cache.get_or_set('mykey', my_callable()), 'value') self.assertEqual(cache.get_or_set('mykey', my_callable()), 'value')
def test_get_or_set_callable_returning_none(self):
self.assertIsNone(cache.get_or_set('mykey', lambda: None))
# Previous get_or_set() doesn't store None in the cache.
self.assertEqual(cache.get('mykey', 'default'), 'default')
def test_get_or_set_version(self): def test_get_or_set_version(self):
msg = "get_or_set() missing 1 required positional argument: 'default'" msg = "get_or_set() missing 1 required positional argument: 'default'"
cache.get_or_set('brian', 1979, version=2) cache.get_or_set('brian', 1979, version=2)