From 21b842cf9cf49fdb9449fb24b46a55974a108186 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 28 Jun 2022 00:48:18 +0200 Subject: [PATCH] Partially revert "Switch loader to use json helper (#73872)" (#74077) --- homeassistant/loader.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/homeassistant/loader.py b/homeassistant/loader.py index ab681d7c42d..589f316532b 100644 --- a/homeassistant/loader.py +++ b/homeassistant/loader.py @@ -11,6 +11,7 @@ from collections.abc import Callable from contextlib import suppress import functools as ft import importlib +import json import logging import pathlib import sys @@ -29,7 +30,6 @@ from .generated.mqtt import MQTT from .generated.ssdp import SSDP from .generated.usb import USB from .generated.zeroconf import HOMEKIT, ZEROCONF -from .helpers.json import JSON_DECODE_EXCEPTIONS, json_loads from .util.async_ import gather_with_concurrency # Typing imports that create a circular dependency @@ -366,8 +366,8 @@ class Integration: continue try: - manifest = json_loads(manifest_path.read_text()) - except JSON_DECODE_EXCEPTIONS as err: + manifest = json.loads(manifest_path.read_text()) + except ValueError as err: _LOGGER.error( "Error parsing manifest.json file at %s: %s", manifest_path, err )