summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-04-08 16:41:45 +0100
committerErik Johnston <erik@matrix.org>2015-04-08 16:41:45 +0100
commit0575840866bd3668605a342dd6a877382505f3e3 (patch)
treeb00fefb2f94d54f7bd533f07fd892301ed47147b
parentMerge pull request #112 from matrix-org/hotfixes-v0.8.1-r2 (diff)
parentBump version (diff)
downloadsynapse-0575840866bd3668605a342dd6a877382505f3e3.tar.xz
Merge pull request #119 from matrix-org/hotfixes-v0.8.1-r3 v0.8.1-r3
Hotfixes v0.8.1 r3
-rw-r--r--synapse/__init__.py2
-rw-r--r--synapse/util/expiringcache.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 749a60329c..fd87c7e2d0 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a Matrix home server.
 """
 
-__version__ = "0.8.1-r2"
+__version__ = "0.8.1-r3"
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:]: