Merge branch 'main' of github.com:Aider-AI/aider

This commit is contained in:
Paul Gauthier 2025-01-13 11:18:31 -08:00
commit 4b03b0a93a

View file

@ -352,10 +352,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")
@ -364,6 +360,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}")