evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't sort keys when dumping json and yaml (#39214)

Browse source
This commit is contained in:
Bram Kragten 2020-08-24 16:58:27 +02:00 • committed by GitHub
parent 181709f3d2
commit 28332f23b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
homeassistant/components/http/view.py
View file

@ -47,9 +47,7 @@ class HomeAssistantView:
) -> web.Response: ) -> web.Response:
"""Return a JSON response.""" """Return a JSON response."""
try: try:
msg = json.dumps( msg = json.dumps(result, cls=JSONEncoder, allow_nan=False).encode("UTF-8")
result, sort_keys=True, cls=JSONEncoder, allow_nan=False
).encode("UTF-8")
except (ValueError, TypeError) as err: except (ValueError, TypeError) as err:
_LOGGER.error("Unable to serialize to JSON: %s\n%s", err, result) _LOGGER.error("Unable to serialize to JSON: %s\n%s", err, result)
raise HTTPInternalServerError raise HTTPInternalServerError

2
homeassistant/util/json.py
View file

@ -54,7 +54,7 @@ def save_json(
Returns True on success. Returns True on success.
""" """
try: try:
json_data = json.dumps(data, sort_keys=True, indent=4, cls=encoder) json_data = json.dumps(data, indent=4, cls=encoder)
except TypeError: except TypeError:
msg = f"Failed to serialize to JSON: {filename}. Bad data at {format_unserializable_data(find_paths_unserializable_data(data))}" msg = f"Failed to serialize to JSON: {filename}. Bad data at {format_unserializable_data(find_paths_unserializable_data(data))}"
_LOGGER.error(msg) _LOGGER.error(msg)

6
homeassistant/util/yaml/dumper.py
View file

@ -10,9 +10,9 @@ from .objects import NodeListClass
def dump(_dict: dict) -> str: def dump(_dict: dict) -> str:
"""Dump YAML to a string and remove null.""" """Dump YAML to a string and remove null."""
return yaml.safe_dump(_dict, default_flow_style=False, allow_unicode=True).replace( return yaml.safe_dump(
": null\n", ":\n" _dict, default_flow_style=False, allow_unicode=True, sort_keys=False
) ).replace(": null\n", ":\n")
def save_yaml(path: str, data: dict) -> None: def save_yaml(path: str, data: dict) -> None: