summary refs log tree commit diff
path: root/synapse/storage/roommember.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-26 16:03:56 +0100
committerErik Johnston <erik@matrix.org>2014-08-26 16:03:56 +0100
commit3df5cb804f0b9a3ca6a5db969a4ac8e8d42685cd (patch)
treee8ababe0e0b7beb91e31d6687f1fb6ad10b73193 /synapse/storage/roommember.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into stream_refactor (diff)
parentFix pyflakes errors (diff)
downloadsynapse-3df5cb804f0b9a3ca6a5db969a4ac8e8d42685cd.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
Diffstat (limited to 'synapse/storage/roommember.py')
-rw-r--r--synapse/storage/roommember.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py

index 86519b60c6..4ad37af0f3 100644 --- a/synapse/storage/roommember.py +++ b/synapse/storage/roommember.py
@@ -15,15 +15,10 @@ from twisted.internet import defer -from synapse.types import UserID -from synapse.api.constants import Membership -from synapse.api.events.room import RoomMemberEvent - -from ._base import SQLBaseStore, Table +from ._base import SQLBaseStore +from synapse.api.constants import Membership -import collections -import json import logging logger = logging.getLogger(__name__)