github
/
ha-core
mirror of https://github.com/home-assistant/core
1
Fork 0
Code Releases Activity

Switch api and event stream to use json helper (#73868)

This commit is contained in:
J. Nick Koston 2022-06-22 20:13:02 -05:00 committed by GitHub
parent ab30d38469
commit 6c41a10142
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
homeassistant/components/api/__init__.py
View File

@ -1,7 +1,6 @@
"""Rest API for Home Assistant.""" """Rest API for Home Assistant."""
import asyncio import asyncio
from http import HTTPStatus from http import HTTPStatus
import json
import logging import logging
from aiohttp import web from aiohttp import web
@ -29,7 +28,7 @@ import homeassistant.core as ha
from homeassistant.core import HomeAssistant from homeassistant.core import HomeAssistant
from homeassistant.exceptions import ServiceNotFound, TemplateError, Unauthorized from homeassistant.exceptions import ServiceNotFound, TemplateError, Unauthorized
from homeassistant.helpers import template from homeassistant.helpers import template
from homeassistant.helpers.json import JSONEncoder from homeassistant.helpers.json import json_dumps, json_loads
from homeassistant.helpers.service import async_get_all_descriptions from homeassistant.helpers.service import async_get_all_descriptions
from homeassistant.helpers.typing import ConfigType from homeassistant.helpers.typing import ConfigType
@ -108,7 +107,7 @@ class APIEventStream(HomeAssistantView):
if event.event_type == EVENT_HOMEASSISTANT_STOP: if event.event_type == EVENT_HOMEASSISTANT_STOP:
data = stop_obj data = stop_obj
else: else:
data = json.dumps(event, cls=JSONEncoder) data = json_dumps(event)
await to_write.put(data) await to_write.put(data)
@ -261,7 +260,7 @@ class APIEventView(HomeAssistantView):
raise Unauthorized() raise Unauthorized()
body = await request.text() body = await request.text()
try: try:
event_data = json.loads(body) if body else None event_data = json_loads(body) if body else None
except ValueError: except ValueError:
return self.json_message( return self.json_message(
"Event data should be valid JSON.", HTTPStatus.BAD_REQUEST "Event data should be valid JSON.", HTTPStatus.BAD_REQUEST
@ -314,7 +313,7 @@ class APIDomainServicesView(HomeAssistantView):
hass: ha.HomeAssistant = request.app["hass"] hass: ha.HomeAssistant = request.app["hass"]
body = await request.text() body = await request.text()
try: try:
data = json.loads(body) if body else None data = json_loads(body) if body else None
except ValueError: except ValueError:
return self.json_message( return self.json_message(
"Data should be valid JSON.", HTTPStatus.BAD_REQUEST "Data should be valid JSON.", HTTPStatus.BAD_REQUEST