Revert "Use orjson to parse json faster (#32153)" (#32185)

This reverts commit 2365e2e8cf.
This commit is contained in:
Paulus Schoutsen 2020-02-25 12:07:16 -08:00 committed by GitHub
parent ceb3985a99
commit 7d8da47309
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 6 additions and 14 deletions

View File

@ -3,7 +3,6 @@ from datetime import datetime
import json
import logging
import orjson
from sqlalchemy import (
Boolean,
Column,
@ -64,7 +63,7 @@ class Events(Base): # type: ignore
try:
return Event(
self.event_type,
orjson.loads(self.event_data),
json.loads(self.event_data),
EventOrigin(self.origin),
_process_timestamp(self.time_fired),
context=context,
@ -134,7 +133,7 @@ class States(Base): # type: ignore
return State(
self.entity_id,
self.state,
orjson.loads(self.attributes),
json.loads(self.attributes),
_process_timestamp(self.last_changed),
_process_timestamp(self.last_updated),
context=context,

View File

@ -9,7 +9,6 @@ from aiohttp import web
from aiohttp.hdrs import CONTENT_TYPE, USER_AGENT
from aiohttp.web_exceptions import HTTPBadGateway, HTTPGatewayTimeout
import async_timeout
import orjson
from homeassistant.const import EVENT_HOMEASSISTANT_CLOSE, __version__
from homeassistant.core import Event, callback
@ -68,7 +67,6 @@ def async_create_clientsession(
loop=hass.loop,
connector=connector,
headers={USER_AGENT: SERVER_SOFTWARE},
json_serialize=lambda x: orjson.dumps(x).decode(),
**kwargs,
)

View File

@ -16,7 +16,6 @@ home-assistant-frontend==20200220.1
importlib-metadata==1.5.0
jinja2>=2.10.3
netdisco==2.6.0
orjson==2.5.1
pip>=8.0.3
python-slugify==4.0.0
pytz>=2019.03

View File

@ -6,8 +6,6 @@ import os
import tempfile
from typing import Any, Dict, List, Optional, Type, Union
import orjson
from homeassistant.exceptions import HomeAssistantError
_LOGGER = logging.getLogger(__name__)
@ -30,7 +28,7 @@ def load_json(
"""
try:
with open(filename, encoding="utf-8") as fdesc:
return orjson.loads(fdesc.read()) # type: ignore
return json.loads(fdesc.read()) # type: ignore
except FileNotFoundError:
# This is not a fatal error
_LOGGER.debug("JSON file not found: %s", filename)
@ -99,7 +97,7 @@ def find_paths_unserializable_data(bad_data: Any) -> List[str]:
obj, obj_path = to_process.popleft()
try:
orjson.dumps(obj)
json.dumps(obj)
continue
except TypeError:
pass
@ -108,7 +106,7 @@ def find_paths_unserializable_data(bad_data: Any) -> List[str]:
for key, value in obj.items():
try:
# Is key valid?
orjson.dumps({key: None})
json.dumps({key: None})
except TypeError:
invalid.append(f"{obj_path}<key: {key}>")
else:

View File

@ -5,7 +5,7 @@ ignore=tests
jobs=2
load-plugins=pylint_strict_informational
persistent=no
extension-pkg-whitelist=ciso8601,orjson
extension-pkg-whitelist=ciso8601
[BASIC]
good-names=id,i,j,k,ex,Run,_,fp

View File

@ -10,7 +10,6 @@ importlib-metadata==1.5.0
jinja2>=2.10.3
PyJWT==1.7.1
cryptography==2.8
orjson==2.5.1
pip>=8.0.3
python-slugify==4.0.0
pytz>=2019.03

View File

@ -44,7 +44,6 @@ REQUIRES = [
"PyJWT==1.7.1",
# PyJWT has loose dependency. We want the latest one.
"cryptography==2.8",
"orjson==2.5.1",
"pip>=8.0.3",
"python-slugify==4.0.0",
"pytz>=2019.03",