Merge pull request #2857 from titusz/improve-read-errors

refactor: Reorder exception handling in file reading method
This commit is contained in:
paul-gauthier 2025-01-13 09:37:38 -08:00 committed by GitHub
commit 939cb7958a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -345,10 +345,6 @@ class InputOutput:
try:
with open(str(filename), "r", encoding=self.encoding) as f:
return f.read()
except OSError as err:
if not silent:
self.tool_error(f"{filename}: unable to read: {err}")
return
except FileNotFoundError:
if not silent:
self.tool_error(f"{filename}: file not found error")
@ -357,6 +353,10 @@ class InputOutput:
if not silent:
self.tool_error(f"{filename}: is a directory")
return
except OSError as err:
if not silent:
self.tool_error(f"{filename}: unable to read: {err}")
return
except UnicodeError as e:
if not silent:
self.tool_error(f"{filename}: {e}")