diff options
| author | Erik Johnston <erik@matrix.org> | 2015-04-08 16:43:17 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-04-08 16:43:17 +0100 |
| commit | 9cef051ce2b97aa6a0513744fe4f7adb93d76fe9 (patch) | |
| tree | c7c2b3ac6447384b91d8f433bd0f3045aab680e6 | |
| parent | Merge pull request #118 from matrix-org/dont-wait-for-notify (diff) | |
| parent | Merge pull request #119 from matrix-org/hotfixes-v0.8.1-r3 (diff) | |
| download | synapse-9cef051ce2b97aa6a0513744fe4f7adb93d76fe9.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/util/expiringcache.py | 2 |
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:]: |