diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-07-19 11:26:04 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-07-19 11:26:04 +0100 |
| commit | be3adfc331ef7f19b2e44b17cd06e463bff09f3a (patch) | |
| tree | 2e565f68ef2154e3882704916eae3b1e8f0c9f3c /synapse/storage/room.py | |
| parent | Merge branch 'develop' into matthew/filter_members (diff) | |
| parent | revert 00bc979 (diff) | |
| download | synapse-be3adfc331ef7f19b2e44b17cd06e463bff09f3a.tar.xz | |
merge develop pydoc for _get_state_for_groups
Diffstat (limited to 'synapse/storage/room.py')
| -rw-r--r-- | synapse/storage/room.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/synapse/storage/room.py b/synapse/storage/room.py index ea6a189185..3147fb6827 100644 --- a/synapse/storage/room.py +++ b/synapse/storage/room.py @@ -13,6 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. +import collections +import logging +import re + +from canonicaljson import json + from twisted.internet import defer from synapse.api.errors import StoreError @@ -20,11 +26,6 @@ from synapse.storage._base import SQLBaseStore from synapse.storage.search import SearchStore from synapse.util.caches.descriptors import cached, cachedInlineCallbacks -import collections -import logging -import simplejson as json -import re - logger = logging.getLogger(__name__) |