mirror of
https://github.com/django/django.git
synced 2024-12-23 01:25:58 +00:00
Fixed #28601 -- Prevented cache.get_or_set() from caching None if default is a callable that returns None.
This commit is contained in:
parent
0e212a705e
commit
4d60261b2a
12
django/core/cache/backends/base.py
vendored
12
django/core/cache/backends/base.py
vendored
@ -155,13 +155,15 @@ class BaseCache:
|
||||
Return the value of the key stored or retrieved.
|
||||
"""
|
||||
val = self.get(key, version=version)
|
||||
if val is None and default is not None:
|
||||
if val is None:
|
||||
if callable(default):
|
||||
default = default()
|
||||
self.add(key, default, timeout=timeout, version=version)
|
||||
# Fetch the value again to avoid a race condition if another caller
|
||||
# added a value between the first get() and the add() above.
|
||||
return self.get(key, default, version=version)
|
||||
if default is not None:
|
||||
self.add(key, default, timeout=timeout, version=version)
|
||||
# Fetch the value again to avoid a race condition if another
|
||||
# caller added a value between the first get() and the add()
|
||||
# above.
|
||||
return self.get(key, default, version=version)
|
||||
return val
|
||||
|
||||
def has_key(self, key, version=None):
|
||||
|
@ -9,4 +9,5 @@ Django 1.11.7 fixes several bugs in 1.11.6.
|
||||
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
5
tests/cache/tests.py
vendored
@ -924,6 +924,11 @@ class BaseCacheTests:
|
||||
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):
|
||||
msg = "get_or_set() missing 1 required positional argument: 'default'"
|
||||
cache.get_or_set('brian', 1979, version=2)
|
||||
|
Loading…
Reference in New Issue
Block a user