Merge branch 'master' of github.com:matrix-org/synapse into develop

This commit is contained in:
Erik Johnston 2015-04-08 16:43:17 +01:00
commit 9cef051ce2
2 changed files with 2 additions and 2 deletions

View file

@ -16,4 +16,4 @@
""" This is a reference implementation of a Matrix home server.
"""
__version__ = "0.8.1-r2"
__version__ = "0.8.1-r3"

View file

@ -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:]: