TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

tools/mpremote: Refactor error handling to apply generally to any errno.

Browse Source 
This rewrites the code that previously manually emitted and caught various
OSError subclasses with equivalent code that uses the errno name dictionary
to do this generically, and updates the exception handler in do_filesystem
to catch them in a similarly-generic fashion using os.strerror to retrieve
an appropriate error message text equivalent to the current messages.

Note that in the CPython environments where mpremote runs, the call to the
OSError constructor already returns an instance of the corresponding mapped
exception subtype.

Signed-off-by: Anson Mansfield <amansfield@mantaro.com>
This commit is contained in:
Anson Mansfield
2025-04-07 10:08:36 -04:00
committed by Damien George
parent cee0419021
commit 805fe083a3
2 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/mpremote/mpremote/commands.py
View File

@@ -393,12 +393,8 @@ def do_filesystem(state, args):
) )
else: else:
do_filesystem_cp(state, path, cp_dest, len(paths) > 1, not args.force) do_filesystem_cp(state, path, cp_dest, len(paths) > 1, not args.force)
except FileNotFoundError as er: except OSError as er:
raise CommandError("{}: {}: No such file or directory.".format(command, er.args[0])) raise CommandError("{}: {}: {}.".format(command, er.strerror, os.strerror(er.errno)))
except IsADirectoryError as er:
raise CommandError("{}: {}: Is a directory.".format(command, er.args[0]))
except FileExistsError as er:
raise CommandError("{}: {}: File exists.".format(command, er.args[0]))
except TransportError as er: except TransportError as er:
raise CommandError("Error with transport:\n{}".format(er.args[0])) raise CommandError("Error with transport:\n{}".format(er.args[0]))

16
tools/mpremote/mpremote/transport.py
View File

@@ -55,18 +55,10 @@ listdir_result = namedtuple("dir_result", ["name", "st_mode", "st_ino", "st_size
# Takes a Transport error (containing the text of an OSError traceback) and # Takes a Transport error (containing the text of an OSError traceback) and
# raises it as the corresponding OSError-derived exception. # raises it as the corresponding OSError-derived exception.
def _convert_filesystem_error(e, info): def _convert_filesystem_error(e, info):
if "OSError" in e.error_output and "ENOENT" in e.error_output: if "OSError" in e.error_output:
return FileNotFoundError(info) for code, estr in errno.errorcode.items():
if "OSError" in e.error_output and "EISDIR" in e.error_output: if estr in e.error_output:
return IsADirectoryError(info) return OSError(code, info)
if "OSError" in e.error_output and "EEXIST" in e.error_output:
return FileExistsError(info)
if "OSError" in e.error_output and "ENODEV" in e.error_output:
return FileNotFoundError(info)
if "OSError" in e.error_output and "EINVAL" in e.error_output:
return OSError(errno.EINVAL, info)
if "OSError" in e.error_output and "EPERM" in e.error_output:
return OSError(errno.EPERM, info)
return e return e