refactor: Reorder exception handling in file reading method

This commit is contained in:
Titusz Pan 2025-01-13 18:29:04 +01:00 committed by Titusz Pan (aider)
parent ac26fc6d5f
commit f28c912d5a
No known key found for this signature in database
GPG key ID: 4793D770C7B5E1D4

View file

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