diff options
author | kaiyou <pierre@jaury.eu> | 2018-03-17 16:02:08 +0100 |
---|---|---|
committer | kaiyou <pierre@jaury.eu> | 2018-03-17 16:02:08 +0100 |
commit | 757f1b58437f912e147f523ea55d45dfda8a8c1e (patch) | |
tree | 034e210d3df7ef63c43ba0d5a35231ba398fedca /synapse/storage/events.py | |
parent | Disable logging to file and rely on the console when using Docker (diff) | |
parent | Merge branch 'hotfixes-v0.26.1' of github.com:matrix-org/synapse (diff) | |
download | synapse-757f1b58437f912e147f523ea55d45dfda8a8c1e.tar.xz |
Merge remote-tracking branch 'upstream/master' into feat-dockerfile
Diffstat (limited to 'synapse/storage/events.py')
-rw-r--r-- | synapse/storage/events.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py index d08f7571d7..73658a9927 100644 --- a/synapse/storage/events.py +++ b/synapse/storage/events.py @@ -38,7 +38,7 @@ from functools import wraps import synapse.metrics import logging -import ujson as json +import simplejson as json # these are only included to make the type annotations work from synapse.events import EventBase # noqa: F401 @@ -56,7 +56,6 @@ event_counter = metrics.register_counter( def encode_json(json_object): if USE_FROZEN_DICTS: - # ujson doesn't like frozen_dicts return encode_canonical_json(json_object) else: return json.dumps(json_object, ensure_ascii=False) |