diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-06-28 14:49:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-28 14:49:57 +0100 |
| commit | 6350bf925e8651f2fae70a1e7eb7182e9161c34a (patch) | |
| tree | 35e766fcb2dabcd1e8978c417709b353d5fdf4bc /synapse/storage/room.py | |
| parent | Revert "Revert "Try to not use as much CPU in the StreamChangeCache"" (#3454) (diff) | |
| download | synapse-6350bf925e8651f2fae70a1e7eb7182e9161c34a.tar.xz | |
Attempt to be more performant on PyPy (#3462)
Diffstat (limited to 'synapse/storage/room.py')
| -rw-r--r-- | synapse/storage/room.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/room.py b/synapse/storage/room.py index ea6a189185..ca0eb187e5 100644 --- a/synapse/storage/room.py +++ b/synapse/storage/room.py @@ -20,9 +20,10 @@ from synapse.storage._base import SQLBaseStore from synapse.storage.search import SearchStore from synapse.util.caches.descriptors import cached, cachedInlineCallbacks +from canonicaljson import json + import collections import logging -import simplejson as json import re logger = logging.getLogger(__name__) |