summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-03-13 16:57:07 +0000
committerErik Johnston <erik@matrix.org>2018-03-13 16:57:07 +0000
commit16adb11cc0aa255f0be98d6446d629e18a0dcefe (patch)
tree64c449e8cd95b447dbf5a09d3944569b169c16b3 /synapse
parentMove user_*_room distributor stuff to master class (diff)
downloadsynapse-16adb11cc0aa255f0be98d6446d629e18a0dcefe.tar.xz
Correct import order
Diffstat (limited to 'synapse')
-rw-r--r--synapse/handlers/room_member.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py
index 669210b73d..78b5feee4f 100644
--- a/synapse/handlers/room_member.py
+++ b/synapse/handlers/room_member.py
@@ -14,6 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import abc
+import logging
+
 from signedjson.key import decode_verify_key_bytes
 from signedjson.sign import verify_signed_json
 from twisted.internet import defer
@@ -28,9 +31,6 @@ from synapse.types import UserID, RoomID
 from synapse.util.async import Linearizer
 from synapse.util.distributor import user_left_room, user_joined_room
 
-import abc
-import logging
-
 
 logger = logging.getLogger(__name__)