summary refs log tree commit diff
path: root/synapse/util
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-04-08 16:43:17 +0100
committerErik Johnston <erik@matrix.org>2015-04-08 16:43:17 +0100
commit9cef051ce2b97aa6a0513744fe4f7adb93d76fe9 (patch)
treec7c2b3ac6447384b91d8f433bd0f3045aab680e6 /synapse/util
parentMerge pull request #118 from matrix-org/dont-wait-for-notify (diff)
parentMerge pull request #119 from matrix-org/hotfixes-v0.8.1-r3 (diff)
downloadsynapse-9cef051ce2b97aa6a0513744fe4f7adb93d76fe9.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/util')
-rw-r--r--synapse/util/expiringcache.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/util/expiringcache.py b/synapse/util/expiringcache.py
index 1c7859297a..06d1eea01b 100644
--- a/synapse/util/expiringcache.py
+++ b/synapse/util/expiringcache.py
@@ -65,7 +65,7 @@ class ExpiringCache(object):
         if self._max_len and len(self._cache.keys()) > self._max_len:
             sorted_entries = sorted(
                 self._cache.items(),
-                key=lambda k, v: v.time,
+                key=lambda (k, v): v.time,
             )
 
             for k, _ in sorted_entries[self._max_len:]: