fix #3445

itervalues(d) calls d.itervalues() [PY2] and d.values() [PY3]
but SortedDict only implements d.values()

2 files changed, 3 insertions, 2 deletions

diff --git a/changelog.d/3445.bugfix b/changelog.d/3445.bugfix
new file mode 100644

index 0000000000..f7f1c4778d
--- /dev/null
+++ 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

index 0bb468385d..6f5995735a 100644
--- a/synapse/federation/send_queue.py
+++ b/synapse/federation/send_queue.py
@@ -32,7 +32,7 @@ Events are replicated via a separate events stream.
 import logging
 from collections import namedtuple
 
-from six import iteritems, itervalues
+from six import iteritems
 
 from sortedcontainers import SortedDict
 
@@ -117,7 +117,7 @@ class FederationRemoteSendQueue(object):
 
             user_ids = set(
                 user_id
-                for uids in itervalues(self.presence_changed)
+                for uids in self.presence_changed.values()
                 for user_id in uids
             )