summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-10-30 11:10:17 +0000
committerMark Haines <mark.haines@matrix.org>2014-10-30 11:10:17 +0000
commit7d709542ca3ae3c69a46f3d9dc383cf9c4dfab95 (patch)
tree155997683ee2d493e53218a725eb2b85b526fbe9 /synapse/storage
parentSYWEB-112: Use the right user ID when determining invites for display on the ... (diff)
downloadsynapse-7d709542ca3ae3c69a46f3d9dc383cf9c4dfab95.tar.xz
Fix pep8 warnings
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/keys.py3
-rw-r--r--synapse/storage/roommember.py8
2 files changed, 7 insertions, 4 deletions
diff --git a/synapse/storage/keys.py b/synapse/storage/keys.py

index 4feb8335ba..fd705138e6 100644 --- a/synapse/storage/keys.py +++ b/synapse/storage/keys.py
@@ -18,9 +18,10 @@ from _base import SQLBaseStore from twisted.internet import defer import OpenSSL -from syutil.crypto.signing_key import decode_verify_key_bytes +from syutil.crypto.signing_key import decode_verify_key_bytes import hashlib + class KeyStore(SQLBaseStore): """Persistence for signature verification keys and tls X.509 certificates """ diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py
index ceeef5880e..93329703a2 100644 --- a/synapse/storage/roommember.py +++ b/synapse/storage/roommember.py
@@ -33,7 +33,9 @@ class RoomMemberStore(SQLBaseStore): target_user_id = event.state_key domain = self.hs.parse_userid(target_user_id).domain except: - logger.exception("Failed to parse target_user_id=%s", target_user_id) + logger.exception( + "Failed to parse target_user_id=%s", target_user_id + ) raise logger.debug( @@ -65,7 +67,8 @@ class RoomMemberStore(SQLBaseStore): # Check if this was the last person to have left. member_events = self._get_members_query_txn( txn, - where_clause="c.room_id = ? AND m.membership = ? AND m.user_id != ?", + where_clause=("c.room_id = ? AND m.membership = ?" + " AND m.user_id != ?"), where_values=(event.room_id, Membership.JOIN, target_user_id,) ) @@ -120,7 +123,6 @@ class RoomMemberStore(SQLBaseStore): else: return None - def get_room_members(self, room_id, membership=None): """Retrieve the current room member list for a room.