diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-05-31 19:03:47 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-31 19:03:47 +1000 |
| commit | c936a52a9eb18e302fbd5158da7188f674912530 (patch) | |
| tree | ce74f2a73cc4730199dfca39420a5564f36daab7 /synapse/handlers/room_list.py | |
| parent | Merge pull request #3303 from NotAFile/py3-memoryview (diff) | |
| download | synapse-c936a52a9eb18e302fbd5158da7188f674912530.tar.xz | |
Consistently use six's iteritems and wrap lazy keys/values in list() if they're not meant to be lazy (#3307)
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, |