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/appservice.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/appservice.py')
| -rw-r--r-- | synapse/handlers/appservice.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/handlers/appservice.py b/synapse/handlers/appservice.py index d9f35a5dba..1c29c43a83 100644 --- a/synapse/handlers/appservice.py +++ b/synapse/handlers/appservice.py @@ -15,6 +15,8 @@ from twisted.internet import defer +from six import itervalues + import synapse from synapse.api.constants import EventTypes from synapse.util.metrics import Measure @@ -119,7 +121,7 @@ class ApplicationServicesHandler(object): yield make_deferred_yieldable(defer.gatherResults([ run_in_background(handle_room_events, evs) - for evs in events_by_room.itervalues() + for evs in itervalues(events_by_room) ], consumeErrors=True)) yield self.store.set_appservice_last_pos(upper_bound) |