summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2017-10-23 15:56:38 +0100
committerRichard van der Hoff <richard@matrix.org>2017-10-23 15:56:38 +0100
commit0be99858f34165258af5d2865818f5baee35118b (patch)
tree9090c6c6f5ba5566786b8654cee07b3c3acd97c8
parentreplace 'except:' with 'except Exception:' (diff)
downloadsynapse-0be99858f34165258af5d2865818f5baee35118b.tar.xz
fix vars named `l`
E741 says "do not use variables named ‘l’, ‘O’, or ‘I’".
-rw-r--r--synapse/util/__init__.py6
-rw-r--r--synapse/util/wheel_timer.py5
2 files changed, 4 insertions, 7 deletions
diff --git a/synapse/util/__init__.py b/synapse/util/__init__.py
index cd1ce62bdb..756d8ffa32 100644
--- a/synapse/util/__init__.py
+++ b/synapse/util/__init__.py
@@ -59,9 +59,9 @@ class Clock(object):
             f(function): The function to call repeatedly.
             msec(float): How long to wait between calls in milliseconds.
         """
-        l = task.LoopingCall(f)
-        l.start(msec / 1000.0, now=False)
-        return l
+        call = task.LoopingCall(f)
+        call.start(msec / 1000.0, now=False)
+        return call
 
     def call_later(self, delay, callback, *args, **kwargs):
         """Call something later
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)