Fixed #27818 -- Replaced try/except/pass with contextlib.suppress().

2 files changed, 11 insertions, 24 deletions

diff --git a/django/core/cache/backends/filebased.py b/django/core/cache/backends/filebased.py
index 56d2cf5b6d..09a68b34bb 100644
--- a/django/core/cache/backends/filebased.py
+++ b/django/core/cache/backends/filebased.py
@@ -7,6 +7,7 @@ import random
 import tempfile
 import time
 import zlib
+from contextlib import suppress
 
 from django.core.cache.backends.base import DEFAULT_TIMEOUT, BaseCache
 from django.core.files.move import file_move_safe
@@ -29,12 +30,10 @@ class FileBasedCache(BaseCache):
 
     def get(self, key, default=None, version=None):
         fname = self._key_to_file(key, version)
-        try:
+        with suppress(FileNotFoundError):
             with open(fname, 'rb') as f:
                 if not self._is_expired(f):
                     return pickle.loads(zlib.decompress(f.read()))
-        except FileNotFoundError:
-            pass
         return default
 
     def set(self, key, value, timeout=DEFAULT_TIMEOUT, version=None):
@@ -60,11 +59,9 @@ class FileBasedCache(BaseCache):
     def _delete(self, fname):
         if not fname.startswith(self._dir) or not os.path.exists(fname):
             return
-        try:
-            os.remove(fname)
-        except FileNotFoundError:
+        with suppress(FileNotFoundError):
             # The file may have been removed by another process.
-            pass
+            os.remove(fname)
 
     def has_key(self, key, version=None):
         fname = self._key_to_file(key, version)
@@ -93,10 +90,8 @@ class FileBasedCache(BaseCache):
 
     def _createdir(self):
         if not os.path.exists(self._dir):
-            try:
+            with suppress(FileExistsError):
                 os.makedirs(self._dir, 0o700)
-            except FileExistsError:
-                pass
 
     def _key_to_file(self, key, version=None):
         """
diff --git a/django/core/cache/backends/locmem.py b/django/core/cache/backends/locmem.py
index cf86dcaa0c..20b6dd4212 100644
--- a/django/core/cache/backends/locmem.py
+++ b/django/core/cache/backends/locmem.py
@@ -1,8 +1,7 @@
 "Thread-safe in-memory cache backend."
-
 import pickle
 import time
-from contextlib import contextmanager
+from contextlib import contextmanager, suppress
 
 from django.core.cache.backends.base import DEFAULT_TIMEOUT, BaseCache
 from django.utils.synch import RWLock
@@ -51,11 +50,9 @@ class LocMemCache(BaseCache):
                 return default
 
         with (self._lock.writer() if acquire_lock else dummy()):
-            try:
+            with suppress(KeyError):
                 del self._cache[key]
                 del self._expire_info[key]
-            except KeyError:
-                pass
             return default
 
     def _set(self, key, value, timeout=DEFAULT_TIMEOUT):
@@ -90,11 +87,9 @@ class LocMemCache(BaseCache):
                 return True
 
         with self._lock.writer():
-            try:
+            with suppress(KeyError):
                 del self._cache[key]
                 del self._expire_info[key]
-            except KeyError:
-                pass
             return False
 
     def _has_expired(self, key):
@@ -112,14 +107,11 @@ class LocMemCache(BaseCache):
                 self._delete(k)
 
     def _delete(self, key):
-        try:
+        with suppress(KeyError):
             del self._cache[key]
-        except KeyError:
-            pass
-        try:
+
+        with suppress(KeyError):
             del self._expire_info[key]
-        except KeyError:
-            pass
 
     def delete(self, key, version=None):
         key = self.make_key(key, version=version)