diff options
| author | Amber H. Brown <hawkowl@atleastfornow.net> | 2020-02-27 23:18:16 +1100 |
|---|---|---|
| committer | Amber H. Brown <hawkowl@atleastfornow.net> | 2020-02-27 23:18:16 +1100 |
| commit | f004ceed71086691ed824648bbca5186b28e581d (patch) | |
| tree | 9541c6d08bab92d116e50b47b8a5a12bf1184b99 /synapse/crypto/keyring.py | |
| parent | fixes (diff) | |
| parent | Store room version on invite (#6983) (diff) | |
| download | synapse-f004ceed71086691ed824648bbca5186b28e581d.tar.xz | |
Merge remote-tracking branch 'origin/develop' into hawkowl/cache-config-without-synctl
Diffstat (limited to 'synapse/crypto/keyring.py')
| -rw-r--r-- | synapse/crypto/keyring.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py index 6fe5a6a26a..983f0ead8c 100644 --- a/synapse/crypto/keyring.py +++ b/synapse/crypto/keyring.py @@ -326,9 +326,7 @@ class Keyring(object): verify_requests (list[VerifyJsonRequest]): list of verify requests """ - remaining_requests = set( - (rq for rq in verify_requests if not rq.key_ready.called) - ) + remaining_requests = {rq for rq in verify_requests if not rq.key_ready.called} @defer.inlineCallbacks def do_iterations(): @@ -396,7 +394,7 @@ class Keyring(object): results = yield fetcher.get_keys(missing_keys) - completed = list() + completed = [] for verify_request in remaining_requests: server_name = verify_request.server_name |