diff options
| author | Neil Johnson <neil@fragile.org.uk> | 2018-03-20 14:25:31 +0000 |
|---|---|---|
| committer | Neil Johnson <neil@fragile.org.uk> | 2018-03-20 14:25:31 +0000 |
| commit | e66fbcbb02d98a0d165f3c5d4642d26add233562 (patch) | |
| tree | 01b5c79c3951f31d5826a852f49aa312d8e47604 /synapse/handlers | |
| parent | Update __init__.py (diff) | |
| parent | Merge pull request #3005 from matrix-org/erikj/fix_cache_size (diff) | |
| download | synapse-e66fbcbb02d98a0d165f3c5d4642d26add233562.tar.xz | |
fix merge conflicts
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 31b1ece13e..80b359b2e7 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 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 |