summary refs log tree commit diff
path: root/synapse/util/wheel_timer.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-10-24 09:16:20 +0100
committerErik Johnston <erik@matrix.org>2017-10-24 09:16:20 +0100
commit39dc52157d3ef80697012e4f3c31bed05f97fd48 (patch)
tree8dccdc67ee0e19ff8e21e3230c9c0b0ccd4a9855 /synapse/util/wheel_timer.py
parentCorrectly wire in update group profile over federation (diff)
parentMerge pull request #2568 from matrix-org/rav/pep8 (diff)
downloadsynapse-39dc52157d3ef80697012e4f3c31bed05f97fd48.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/group_fed_update_profile
Diffstat (limited to 'synapse/util/wheel_timer.py')
-rw-r--r--synapse/util/wheel_timer.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/synapse/util/wheel_timer.py b/synapse/util/wheel_timer.py

index 7412fc57a4..b70f9a6b0a 100644 --- a/synapse/util/wheel_timer.py +++ b/synapse/util/wheel_timer.py
@@ -91,7 +91,4 @@ class WheelTimer(object): return ret def __len__(self): - l = 0 - for entry in self.entries: - l += len(entry.queue) - return l + return sum(len(entry.queue) for entry in self.entries)