This commit is contained in:
Paulus Schoutsen committed 2019-07-31 12:25:30 -07:00
1 parent da05dfe708
commit 4de97abc3a
2676 files changed
+163166 -140084

No files matched your search

@@ -23,6 +23,7 @@ class RequestDataValidator:
def __call__(self, method):
"""Decorate a function."""
@wraps(method)
async def wrapper(view, request, *args, **kwargs):
"""Wrap a request handler with data validation."""
@@ -30,18 +31,18 @@ class RequestDataValidator:
try:
data = await request.json()
except ValueError:
if not self._allow_empty or \
(await request.content.read()) != b'':
_LOGGER.error('Invalid JSON received.')
return view.json_message('Invalid JSON.', 400)
if not self._allow_empty or (await request.content.read()) != b"":
_LOGGER.error("Invalid JSON received.")
return view.json_message("Invalid JSON.", 400)
data = {}
try:
kwargs['data'] = self._schema(data)
kwargs["data"] = self._schema(data)
except vol.Invalid as err:
_LOGGER.error('Data does not match schema: %s', err)
_LOGGER.error("Data does not match schema: %s", err)
return view.json_message(
'Message format incorrect: {}'.format(err), 400)
"Message format incorrect: {}".format(err), 400
)
result = await method(view, request, *args, **kwargs)
return result