Skip to content

Use load_json_object in html5 #88586

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
+3 −6
Merged

Use load_json_object in html5 #88586

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
9 changes: 3 additions & 6 deletions homeassistant/components/html5/notify.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
from homeassistant.helpers.json import save_json
from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
from homeassistant.util import ensure_unique_string
from homeassistant.util.json import load_json
from homeassistant.util.json import JsonObjectType, load_json_object

from .const import DOMAIN, SERVICE_DISMISS

Expand Down Expand Up @@ -175,9 +175,6 @@ def get_service(

registrations = _load_config(json_path)

if registrations is None:
return None

vapid_pub_key = config[ATTR_VAPID_PUB_KEY]
vapid_prv_key = config[ATTR_VAPID_PRV_KEY]
vapid_email = config[ATTR_VAPID_EMAIL]
Expand All @@ -197,10 +194,10 @@ def websocket_appkey(hass, connection, msg):
)


def _load_config(filename):
def _load_config(filename: str) -> JsonObjectType:
"""Load configuration."""
with suppress(HomeAssistantError):
return load_json(filename)
return load_json_object(filename)
return {}


Expand Down