From d7b2aa24f75434c2ce50100cfef3586071e0747a Mon Sep 17 00:00:00 2001 From: Дилян Палаузов Date: Wed, 3 Jan 2018 18:52:12 -0500 Subject: Fixed #28982 -- Simplified code with and/or. --- django/core/cache/backends/locmem.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'django/core/cache') 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: -- cgit v1.3