diff options
| author | Erik Johnston <erikj@jki.re> | 2018-05-24 14:44:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-24 14:44:57 +0100 |
| commit | 68399fc4de497c0c450520261f0fa6f9d230c95d (patch) | |
| tree | 238e41d3c83d9a4260d0a9f7e7c03deb2fa53f2e | |
| parent | Merge branch 'release-v0.30.0' into develop (diff) | |
| parent | s/values/itervalues/ (diff) | |
| download | synapse-68399fc4de497c0c450520261f0fa6f9d230c95d.tar.xz | |
Merge pull request #3267 from matrix-org/erikj/iter_filter
Use iter* methods for _filter_events_for_server
| -rw-r--r-- | synapse/handlers/federation.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index ba3ede8024..c15c8c1ed5 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -479,18 +479,18 @@ class FederationHandler(BaseHandler): # to get all state ids that we're interested in. event_map = yield self.store.get_events([ e_id - for key_to_eid in event_to_state_ids.values() - for key, e_id in key_to_eid.items() + for key_to_eid in event_to_state_ids.itervalues() + for key, e_id in key_to_eid.iteritems() if key[0] != EventTypes.Member or check_match(key[1]) ]) event_to_state = { e_id: { key: event_map[inner_e_id] - for key, inner_e_id in key_to_eid.items() + for key, inner_e_id in key_to_eid.iteritems() if inner_e_id in event_map } - for e_id, key_to_eid in event_to_state_ids.items() + for e_id, key_to_eid in event_to_state_ids.iteritems() } def redact_disallowed(event, state): @@ -505,7 +505,7 @@ class FederationHandler(BaseHandler): # membership states for the requesting server to determine # if the server is either in the room or has been invited # into the room. - for ev in state.values(): + for ev in state.itervalues(): if ev.type != EventTypes.Member: continue try: |