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/handlers | |
| 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/handlers')
| -rw-r--r-- | synapse/handlers/e2e_keys.py | 2 | ||||
| -rw-r--r-- | synapse/handlers/message.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/synapse/handlers/e2e_keys.py b/synapse/handlers/e2e_keys.py index 668a90e495..ce2c87e400 100644 --- a/synapse/handlers/e2e_keys.py +++ b/synapse/handlers/e2e_keys.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import ujson as json +import simplejson as json import logging from canonicaljson import encode_canonical_json 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 |