diff options
author | Erik Johnston <erik@matrix.org> | 2016-02-03 11:06:29 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-02-03 11:06:29 +0000 |
commit | 6f52e90065243682d93e5f89b071e1fb056fa6ab (patch) | |
tree | 98b9c43dd42dbc3d14a96f1b81e0631c7ac271c9 /synapse/util/caches/treecache.py | |
parent | Unused import (diff) | |
parent | Merge pull request #553 from matrix-org/daniel/accesstokenlogging (diff) | |
download | synapse-6f52e90065243682d93e5f89b071e1fb056fa6ab.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/public_room_fix
Diffstat (limited to 'synapse/util/caches/treecache.py')
-rw-r--r-- | synapse/util/caches/treecache.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/util/caches/treecache.py b/synapse/util/caches/treecache.py index 29d02f7e95..03bc1401b7 100644 --- a/synapse/util/caches/treecache.py +++ b/synapse/util/caches/treecache.py @@ -58,7 +58,7 @@ class TreeCache(object): if n: break - node_and_keys[i+1][0].pop(k) + node_and_keys[i + 1][0].pop(k) popped, cnt = _strip_and_count_entires(popped) self.size -= cnt |