diff options
| author | Erik Johnston <erik@matrix.org> | 2018-03-19 11:40:32 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-03-19 11:41:01 +0000 |
| commit | fa728034900ae63d8132962008319d37df3993db (patch) | |
| tree | 9ed8d7230c116bc28057f11395a795d3f993880c /synapse/handlers/message.py | |
| parent | spell out not to massively increase bcrypt rounds (diff) | |
| parent | Merge branch 'hotfixes-v0.26.1' of github.com:matrix-org/synapse (diff) | |
| download | synapse-fa728034900ae63d8132962008319d37df3993db.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
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 4f97c8db79..5a8ddc253e 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -38,7 +38,7 @@ from canonicaljson import encode_canonical_json import logging import random -import ujson +import simplejson logger = logging.getLogger(__name__) @@ -678,8 +678,8 @@ class EventCreationHandler(object): # 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 |