fix matrix-org#3445

itervalues(d) calls d.itervalues() [PY2] and d.values() [PY3] but SortedDict only implements d.values()
bsmr · Aug 29, 2018 · 79a8a34 · 79a8a34
1 parent 82276a1
commit 79a8a34
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/changelog.d/3445.bugfix b/changelog.d/3445.bugfix
@@ -0,0 +1 @@
+do not use six.itervalues() on SortedDict()
diff --git a/synapse/federation/send_queue.py b/synapse/federation/send_queue.py
@@ -32,7 +32,7 @@
 import logging
 from collections import namedtuple
 
-from six import iteritems, itervalues
+from six import iteritems
 
 from sortedcontainers import SortedDict
 
@@ -117,7 +117,7 @@ def _clear_queue_before_pos(self, position_to_delete):
 
             user_ids = set(
                 user_id
-                for uids in itervalues(self.presence_changed)
+                for uids in self.presence_changed.values()
                 for user_id in uids
             )