diff options
| author | Erik Johnston <erik@matrix.org> | 2018-03-16 00:13:51 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-03-16 00:13:51 +0000 |
| commit | f609acc109af5b981c5662932392b60fa44ec5f0 (patch) | |
| tree | 12041428a201b66a7c71569b8a8f1a855b9db032 /synapse/handlers/message.py | |
| parent | Merge pull request #2798 from jeremycline/fedora-repo (diff) | |
| parent | Newline (diff) | |
| download | synapse-f609acc109af5b981c5662932392b60fa44ec5f0.tar.xz | |
Merge branch 'hotfixes-v0.26.1' of github.com:matrix-org/synapse v0.26.1
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 |