Fixed #26792 -- Allowed None for the value of cache.get_or_set().

1 files changed, 2 insertions, 4 deletions

diff --git a/django/core/cache/backends/base.py b/django/core/cache/backends/base.py
index a07a34e3b5..9cbfe0be1d 100644
--- a/django/core/cache/backends/base.py
+++ b/django/core/cache/backends/base.py
@@ -147,7 +147,7 @@ class BaseCache(object):
                 d[k] = val
         return d
 
-    def get_or_set(self, key, default=None, timeout=DEFAULT_TIMEOUT, version=None):
+    def get_or_set(self, key, default, timeout=DEFAULT_TIMEOUT, version=None):
         """
         Fetch a given key from the cache. If the key does not exist,
         the key is added and set to the default value. The default value can
@@ -156,10 +156,8 @@ class BaseCache(object):
 
         Return the value of the key stored or retrieved.
         """
-        if default is None:
-            raise ValueError('You need to specify a value.')
         val = self.get(key, version=version)
-        if val is None:
+        if val is None and default is not None:
             if callable(default):
                 default = default()
             self.add(key, default, timeout=timeout, version=version)