Skip to content

fix: ensure that result is not none #565

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
Lash-L merged 4 commits into from
Oct 25, 2025
Merged

fix: ensure that result is not none #565

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a4b7c92
fix: ensure that result is not none
Lash-L Oct 25, 2025
b19139b
chore: update roborock/protocols/v1_protocol.py
Lash-L Oct 25, 2025
c59a2c0
fix: set to empty dict
Lash-L Oct 25, 2025
f6efebe
chore: go back to the other way
Lash-L Oct 25, 2025
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
4 changes: 3 additions & 1 deletion roborock/protocols/v1_protocol.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,11 @@ def decode_rpc_response(message: RoborockMessage) -> ResponseMessage:
exc: RoborockException | None = None
if error := data_point_response.get("error"):
exc = RoborockException(error)
if not (result := data_point_response.get("result")):
if "result" not in data_point_response:
exc = RoborockException(f"Invalid V1 message format: missing 'result' in data point for {message.payload!r}")
result = None
else:
result = data_point_response["result"]
Copy link
Contributor

@allenporter allenporter Oct 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this works too and can keep it a single line:

Suggested change
if "result" not in data_point_response:
exc = RoborockException(f"Invalid V1 message format: missing 'result' in data point for {message.payload!r}")
result = None
else:
result = data_point_response["result"]
if (result := data_point_response.get("result")) is None:
exc = RoborockException(f"Invalid V1 message format: missing 'result' in data point for {message.payload!r}")
else:

_LOGGER.debug("Decoded V1 message result: %s", result)
if isinstance(result, str):
if result == "unknown_method":
Expand Down
Loading