diff options
| author | Erik Johnston <erik@matrix.org> | 2018-03-15 23:43:31 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-03-15 23:43:31 +0000 |
| commit | 926ba76e23ea9d55638baff541cdfaeb9e01ac47 (patch) | |
| tree | 0fb744087cf47900122e60d5fa4b17765588a6b7 /synapse/storage/events.py | |
| parent | Merge pull request #2798 from jeremycline/fedora-repo (diff) | |
| download | synapse-926ba76e23ea9d55638baff541cdfaeb9e01ac47.tar.xz | |
Replace ujson with simplejson
Diffstat (limited to 'synapse/storage/events.py')
| -rw-r--r-- | synapse/storage/events.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py index d08f7571d7..bcca563293 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,7 @@ event_counter = metrics.register_counter( def encode_json(json_object): if USE_FROZEN_DICTS: - # ujson doesn't like frozen_dicts + # simplejson doesn't like frozen_dicts return encode_canonical_json(json_object) else: return json.dumps(json_object, ensure_ascii=False) |