Refs #23919 -- Replaced errno checking with PEP 3151 exceptions.

1 files changed, 7 insertions, 14 deletions

diff --git a/django/core/cache/backends/filebased.py b/django/core/cache/backends/filebased.py
index ae5b48c054..896f798e95 100644
--- a/django/core/cache/backends/filebased.py
+++ b/django/core/cache/backends/filebased.py
@@ -1,5 +1,4 @@
 "File-based cache backend"
-import errno
 import glob
 import hashlib
 import os
@@ -34,9 +33,8 @@ class FileBasedCache(BaseCache):
             with open(fname, 'rb') as f:
                 if not self._is_expired(f):
                     return pickle.loads(zlib.decompress(f.read()))
-        except IOError as e:
-            if e.errno != errno.ENOENT:
-                raise
+        except FileNotFoundError:
+            pass
         return default
 
     def set(self, key, value, timeout=DEFAULT_TIMEOUT, version=None):
@@ -64,11 +62,9 @@ class FileBasedCache(BaseCache):
             return
         try:
             os.remove(fname)
-        except OSError as e:
-            # ENOENT can happen if the cache file is removed (by another
-            # process) after the os.path.exists check.
-            if e.errno != errno.ENOENT:
-                raise
+        except FileNotFoundError:
+            # The file may have been removed by another process.
+            pass
 
     def has_key(self, key, version=None):
         fname = self._key_to_file(key, version)
@@ -99,11 +95,8 @@ class FileBasedCache(BaseCache):
         if not os.path.exists(self._dir):
             try:
                 os.makedirs(self._dir, 0o700)
-            except OSError as e:
-                if e.errno != errno.EEXIST:
-                    raise EnvironmentError(
-                        "Cache directory '%s' does not exist "
-                        "and could not be created'" % self._dir)
+            except FileExistsError:
+                pass
 
     def _key_to_file(self, key, version=None):
         """