Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-08-06 03:54:11 -04:00
Code Issues Projects Releases Packages Wiki Activity

Replace iteritems/itervalues/iterkeys with native versions. (#7692)

Browse source
This commit is contained in:
Patrick Cloke 2020-06-15 07:03:36 -04:00 • committed by GitHub
parent 2d11ea385c
commit bd6dc17221
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
47 changed files with 184 additions and 263 deletions
Download patch file Download diff file Expand all files Collapse all files

21
synapse/visibility.py
View file

@ -16,7 +16,6 @@
import logging
import operator
from six import iteritems, itervalues
from six.moves import map
from twisted.internet import defer
@ -298,7 +297,7 @@ def filter_events_for_server(
# 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 itervalues(state):
for ev in state.values():
if ev.type != EventTypes.Member:
continue
try:
@ -332,7 +331,7 @@ def filter_events_for_server(
)
visibility_ids = set()
for sids in itervalues(event_to_state_ids):
for sids in event_to_state_ids.values():
hist = sids.get((EventTypes.RoomHistoryVisibility, ""))
if hist:
visibility_ids.add(hist)
@ -345,7 +344,7 @@ def filter_events_for_server(
event_map = yield storage.main.get_events(visibility_ids)
all_open = all(
e.content.get("history_visibility") in (None, "shared", "world_readable")
for e in itervalues(event_map)
for e in event_map.values()
)
if not check_history_visibility_only:
@ -394,8 +393,8 @@ def filter_events_for_server(
#
event_id_to_state_key = {
event_id: key
for key_to_eid in itervalues(event_to_state_ids)
for key, event_id in iteritems(key_to_eid)
for key_to_eid in event_to_state_ids.values()
for key, event_id in key_to_eid.items()
}
def include(typ, state_key):
@ -409,20 +408,16 @@ def filter_events_for_server(
return state_key[idx + 1 :] == server_name
event_map = yield storage.main.get_events(
[
e_id
for e_id, key in iteritems(event_id_to_state_key)
if include(key[0], key[1])
]
[e_id for e_id, key in event_id_to_state_key.items() if include(key[0], key[1])]
)
event_to_state = {
e_id: {
key: event_map[inner_e_id]
for key, inner_e_id in iteritems(key_to_eid)
for key, inner_e_id in key_to_eid.items()
if inner_e_id in event_map
}
for e_id, key_to_eid in iteritems(event_to_state_ids)
for e_id, key_to_eid in event_to_state_ids.items()
}
to_return = []