forked from MirrorHub/synapse
PEP8
This commit is contained in:
parent
68264d7404
commit
98385888b8
|
@ -63,16 +63,16 @@ class EndToEndKeyStore(SQLBaseStore):
|
|||
query_clauses.append(query_clause)
|
||||
|
||||
sql = (
|
||||
"SELECT k.user_id, k.device_id, "
|
||||
" d.display_name AS device_display_name, "
|
||||
" k.key_json"
|
||||
" FROM e2e_device_keys_json k"
|
||||
" LEFT JOIN devices d ON d.user_id = k.user_id"
|
||||
" AND d.device_id = k.device_id"
|
||||
" WHERE %s"
|
||||
) % (
|
||||
" OR ".join("("+q+")" for q in query_clauses)
|
||||
)
|
||||
"SELECT k.user_id, k.device_id, "
|
||||
" d.display_name AS device_display_name, "
|
||||
" k.key_json"
|
||||
" FROM e2e_device_keys_json k"
|
||||
" LEFT JOIN devices d ON d.user_id = k.user_id"
|
||||
" AND d.device_id = k.device_id"
|
||||
" WHERE %s"
|
||||
) % (
|
||||
" OR ".join("(" + q + ")" for q in query_clauses)
|
||||
)
|
||||
|
||||
txn.execute(sql, query_params)
|
||||
rows = self.cursor_to_dict(txn)
|
||||
|
|
|
@ -15,7 +15,6 @@
|
|||
|
||||
from twisted.internet import defer
|
||||
|
||||
import synapse.api.errors
|
||||
import tests.unittest
|
||||
import tests.utils
|
||||
|
||||
|
@ -68,7 +67,6 @@ class EndToEndKeyStoreTestCase(tests.unittest.TestCase):
|
|||
"device_display_name": "display_name",
|
||||
}, dev)
|
||||
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def test_multiple_devices(self):
|
||||
now = 1470174257070
|
||||
|
|
Loading…
Reference in a new issue