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/appservice.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/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) |