diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2020-06-15 16:37:52 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2020-06-15 16:37:52 +0100 |
| commit | 6efb2b0ad44b4cfb1f05a77c1a5a22b527758b37 (patch) | |
| tree | 56c11988292ef856c99e8fb4f9b08b648e5d93d8 /synapse/state/v2.py | |
| parent | Merge branch 'develop' into babolivier/mark_unread (diff) | |
| parent | Discard RDATA from already seen positions. (#7648) (diff) | |
| download | synapse-6efb2b0ad44b4cfb1f05a77c1a5a22b527758b37.tar.xz | |
Merge branch 'develop' into babolivier/mark_unread
Diffstat (limited to 'synapse/state/v2.py')
| -rw-r--r-- | synapse/state/v2.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/synapse/state/v2.py b/synapse/state/v2.py index 18484e2fa6..e25bc5d264 100644 --- a/synapse/state/v2.py +++ b/synapse/state/v2.py @@ -18,8 +18,6 @@ import itertools import logging from typing import Dict, List, Optional -from six import iteritems, itervalues - from twisted.internet import defer import synapse.state @@ -87,7 +85,7 @@ def resolve_events_with_store( full_conflicted_set = set( itertools.chain( - itertools.chain.from_iterable(itervalues(conflicted_state)), auth_diff + itertools.chain.from_iterable(conflicted_state.values()), auth_diff ) ) @@ -572,7 +570,7 @@ def lexicographical_topological_sort(graph, key): # `(key(node), node)` so that sorting does the right thing zero_outdegree = [] - for node, edges in iteritems(graph): + for node, edges in graph.items(): if len(edges) == 0: zero_outdegree.append((key(node), node)) |