summaryrefslogtreecommitdiff
path: root/django/core/cache
diff options
context:
space:
mode:
authorДилян Палаузов <Dilyan.Palauzov@db.com>2018-01-03 18:52:12 -0500
committerTim Graham <timograham@gmail.com>2018-01-03 20:12:23 -0500
commitd7b2aa24f75434c2ce50100cfef3586071e0747a (patch)
tree9074eb7522888e744f948c52174f367a4281c200 /django/core/cache
parentc2d0f8c084456b5073252a91eeb09ab3d7453b18 (diff)
Fixed #28982 -- Simplified code with and/or.
Diffstat (limited to 'django/core/cache')
-rw-r--r--django/core/cache/backends/locmem.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/django/core/cache/backends/locmem.py b/django/core/cache/backends/locmem.py
index 9809880bf5..69561fb735 100644
--- a/django/core/cache/backends/locmem.py
+++ b/django/core/cache/backends/locmem.py
@@ -98,9 +98,7 @@ class LocMemCache(BaseCache):
def _has_expired(self, key):
exp = self._expire_info.get(key, -1)
- if exp is None or exp > time.time():
- return False
- return True
+ return exp is not None and exp <= time.time()
def _cull(self):
if self._cull_frequency == 0: