Skip to content

Use match statements in _handle_vumark_exceptions #2135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adamtheturtle merged 2 commits into from
Apr 15, 2026
Merged

Use match statements in _handle_vumark_exceptions #2135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f35725
Use match statements in _handle_vumark_exceptions
adamtheturtle Apr 15, 2026
5c0efef
Use wildcard case for TargetStatusNotSuccessError branch
adamtheturtle Apr 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 16 additions & 11 deletions src/vws_cli/vumark.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,18 +58,23 @@ def _handle_vumark_exceptions() -> Iterator[None]:
try:
yield
except (UnknownTargetError, TargetStatusNotSuccessError) as exc:
if isinstance(exc, UnknownTargetError):
error_message = f'Error: Target "{exc.target_id}" does not exist.'
else:
error_message = (
f'Error: The target "{exc.target_id}" is not in the success '
"state and cannot be used to generate a VuMark instance."
)
match exc:
case UnknownTargetError():
error_message = (
f'Error: Target "{exc.target_id}" does not exist.'
)
case _:
error_message = (
f'Error: The target "{exc.target_id}" is not in the '
"success state and cannot be used to generate a "
"VuMark instance."
)
except (VWSError, ServerError) as exc:
if isinstance(exc, InvalidInstanceIdError):
error_message = "Error: The given instance ID is invalid."
else:
error_message = get_error_message(exc=exc)
match exc:
case InvalidInstanceIdError():
error_message = "Error: The given instance ID is invalid."
case _:
error_message = get_error_message(exc=exc)
else:
return

Expand Down
62 changes: 31 additions & 31 deletions uv.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading