diff options
| author | Erik Johnston <erikj@jki.re> | 2018-08-29 16:29:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-29 16:29:57 +0100 |
| commit | 7f0399586dd595d20e1d4f2ce735e9efa9a96d0a (patch) | |
| tree | 26c61ccee857c692914bee8a9a666d7ae0fa7d73 | |
| parent | Update CONTRIBUTING to clarify miscs & Markdown (#3730) (diff) | |
| parent | changelog (diff) | |
| download | synapse-7f0399586dd595d20e1d4f2ce735e9efa9a96d0a.tar.xz | |
Merge pull request #3768 from krombel/fix_3445
fix #3445 - do not use itervalues() on SortedDict()
| -rw-r--r-- | changelog.d/3768.bugfix | 1 | ||||
| -rw-r--r-- | synapse/federation/send_queue.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/3768.bugfix b/changelog.d/3768.bugfix new file mode 100644 index 0000000000..a039a7fa68 --- /dev/null +++ b/changelog.d/3768.bugfix @@ -0,0 +1 @@ +Fix bug in sending presence over federation 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 ) |