summary refs log tree commit diff
path: root/synapse/crypto
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-19 11:58:04 +0100
committerErik Johnston <erik@matrix.org>2015-05-19 11:58:04 +0100
commit62ccc6d95f0ce1f9f23d7458b2d7f950360b8fb9 (patch)
tree0f7e3d92b1328bc35b56b4b019aed8e39379a8bf /synapse/crypto
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf (diff)
downloadsynapse-62ccc6d95f0ce1f9f23d7458b2d7f950360b8fb9.tar.xz
Don't reuse var names
Diffstat (limited to 'synapse/crypto')
-rw-r--r--synapse/crypto/keyring.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py
index c626f78f4b..1f24e58ba0 100644
--- a/synapse/crypto/keyring.py
+++ b/synapse/crypto/keyring.py
@@ -144,8 +144,8 @@ class Keyring(object):
                 )
 
         perspective_results = yield defer.gatherResults([
-            get_key(name, keys)
-            for name, keys in self.perspective_servers.items()
+            get_key(p_name, p_keys)
+            for p_name, p_keys in self.perspective_servers.items()
         ])
 
         for results in perspective_results: