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/rest | |
| 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/rest')
| -rw-r--r-- | synapse/rest/client/v1/room.py | 2 | ||||
| -rw-r--r-- | synapse/rest/client/v2_alpha/sync.py | 2 | ||||
| -rw-r--r-- | synapse/rest/media/v1/preview_url_resource.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index 75b735b47d..80989731fa 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -29,7 +29,7 @@ from synapse.http.servlet import ( import logging import urllib -import ujson as json +import simplejson as json logger = logging.getLogger(__name__) diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py index a0a8e4b8e4..eb91c0b293 100644 --- a/synapse/rest/client/v2_alpha/sync.py +++ b/synapse/rest/client/v2_alpha/sync.py @@ -33,7 +33,7 @@ from ._base import set_timeline_upper_limit import itertools import logging -import ujson as json +import simplejson as json logger = logging.getLogger(__name__) diff --git a/synapse/rest/media/v1/preview_url_resource.py b/synapse/rest/media/v1/preview_url_resource.py index 40d2e664eb..a413cb6226 100644 --- a/synapse/rest/media/v1/preview_url_resource.py +++ b/synapse/rest/media/v1/preview_url_resource.py @@ -35,7 +35,7 @@ import os import re import fnmatch import cgi -import ujson as json +import simplejson as json import urlparse import itertools import datetime |