diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-06-04 00:09:17 +0300 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-06-04 00:09:17 +0300 |
| commit | 28f09fcdd51796dd5036cb74e62b7a74d753f4be (patch) | |
| tree | 40f098938d04cf93c8f7bb7aa82af879479b3334 /synapse/handlers/room_list.py | |
| parent | more comments (diff) | |
| parent | Merge pull request #3317 from thegcat/feature/3312-add_ipv6_to_blacklist_exam... (diff) | |
| download | synapse-28f09fcdd51796dd5036cb74e62b7a74d753f4be.tar.xz | |
Merge branch 'develop' into matthew/filter_members
Diffstat (limited to 'synapse/handlers/room_list.py')
| -rw-r--r-- | synapse/handlers/room_list.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/room_list.py b/synapse/handlers/room_list.py index 5757bb7f8a..fc507cef36 100644 --- a/synapse/handlers/room_list.py +++ b/synapse/handlers/room_list.py @@ -15,6 +15,7 @@ from twisted.internet import defer +from six import iteritems from six.moves import range from ._base import BaseHandler @@ -307,7 +308,7 @@ class RoomListHandler(BaseHandler): ) event_map = yield self.store.get_events([ - event_id for key, event_id in current_state_ids.iteritems() + event_id for key, event_id in iteritems(current_state_ids) if key[0] in ( EventTypes.JoinRules, EventTypes.Name, |