diff options
| author | Erik Johnston <erik@matrix.org> | 2015-05-19 14:27:11 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-05-19 14:27:11 +0100 |
| commit | 6837c5edab94df93addc85d1900011ba2182e0f1 (patch) | |
| tree | 44e2da03e93a91a2a92ff93e5368c2bd291df1c1 | |
| parent | Don't apply new room join hack if depth > 5 (diff) | |
| download | synapse-6837c5edab94df93addc85d1900011ba2182e0f1.tar.xz | |
Handle the case when things return empty but non none things
| -rw-r--r-- | synapse/crypto/keyring.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py index 35f9ac3517..aff69c5f83 100644 --- a/synapse/crypto/keyring.py +++ b/synapse/crypto/keyring.py @@ -159,7 +159,7 @@ class Keyring(object): ) with limiter: - if keys is None: + if not keys: try: keys = yield self.get_server_verify_key_v2_direct( server_name, key_ids @@ -171,7 +171,7 @@ class Keyring(object): type(e).__name__, str(e.message), ) - if keys is None: + if not keys: keys = yield self.get_server_verify_key_v1_direct( server_name, key_ids ) |