Skip to content

Use load_json_object in matrix #88587

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
epenet merged 1 commit into from
Feb 22, 2023
Merged

Use load_json_object in matrix #88587

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 3 additions & 5 deletions homeassistant/components/matrix/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.json import save_json
from homeassistant.helpers.typing import ConfigType
from homeassistant.util.json import load_json
from homeassistant.util.json import JsonObjectType, load_json_object

from .const import DOMAIN, FORMAT_HTML, FORMAT_TEXT, SERVICE_SEND_MESSAGE

Expand Down Expand Up @@ -276,15 +276,13 @@ def _join_rooms(self):
except MatrixRequestError as ex:
_LOGGER.error("Could not join room %s: %s", room_id, ex)

def _get_auth_tokens(self):
def _get_auth_tokens(self) -> JsonObjectType:
"""Read sorted authentication tokens from disk.

Returns the auth_tokens dictionary.
"""
try:
auth_tokens = load_json(self._session_filepath)

return auth_tokens
return load_json_object(self._session_filepath)
except HomeAssistantError as ex:
_LOGGER.warning(
"Loading authentication tokens from file '%s' failed: %s",
Expand Down