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/handlers/message.py | |
parent | Merge pull request #2798 from jeremycline/fedora-repo (diff) | |
download | synapse-926ba76e23ea9d55638baff541cdfaeb9e01ac47.tar.xz |
Replace ujson with simplejson
Diffstat (limited to 'synapse/handlers/message.py')
-rw-r--r-- | synapse/handlers/message.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index 21f1717dd2..d7413833ed 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -35,7 +35,7 @@ from canonicaljson import encode_canonical_json import logging import random -import ujson +import simplejson logger = logging.getLogger(__name__) @@ -561,8 +561,8 @@ class MessageHandler(BaseHandler): # Ensure that we can round trip before trying to persist in db try: - dump = ujson.dumps(unfreeze(event.content)) - ujson.loads(dump) + dump = simplejson.dumps(unfreeze(event.content)) + simplejson.loads(dump) except Exception: logger.exception("Failed to encode content: %r", event.content) raise |