summary refs log tree commit diff
path: root/synapse/app/synchrotron.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-04-20 15:43:52 +0100
committerGitHub <noreply@github.com>2018-04-20 15:43:52 +0100
commitdc875d2712d1b844fa8ef398bab7894867d0cf60 (patch)
tree36477571ae07c3aab0898c8e994cf9964232cbde /synapse/app/synchrotron.py
parentMerge pull request #3107 from NotAFile/py3-bool-nonzero (diff)
parentUse six.itervalues in some places (diff)
downloadsynapse-dc875d2712d1b844fa8ef398bab7894867d0cf60.tar.xz
Merge pull request #3106 from NotAFile/py3-six-itervalues-1
Use six.itervalues in some places
Diffstat (limited to 'synapse/app/synchrotron.py')
-rw-r--r--synapse/app/synchrotron.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/app/synchrotron.py b/synapse/app/synchrotron.py
index 508b66613d..2fddcd935a 100644
--- a/synapse/app/synchrotron.py
+++ b/synapse/app/synchrotron.py
@@ -58,6 +58,8 @@ from synapse.util.versionstring import get_version_string
 from twisted.internet import defer, reactor
 from twisted.web.resource import NoResource
 
+from six import iteritems
+
 logger = logging.getLogger("synapse.app.synchrotron")
 
 
@@ -211,7 +213,7 @@ class SynchrotronPresence(object):
 
     def get_currently_syncing_users(self):
         return [
-            user_id for user_id, count in self.user_to_num_current_syncs.iteritems()
+            user_id for user_id, count in iteritems(self.user_to_num_current_syncs)
             if count > 0
         ]