Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-12-15 22:23:53 -05: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

6
synapse/handlers/room.py
View file

@ -24,7 +24,7 @@ import string
from collections import OrderedDict
from typing import Tuple
from six import iteritems, string_types
from six import string_types
from synapse.api.constants import (
EventTypes,
@ -377,7 +377,7 @@ class RoomCreationHandler(BaseHandler):
# map from event_id to BaseEvent
old_room_state_events = await self.store.get_events(old_room_state_ids.values())
for k, old_event_id in iteritems(old_room_state_ids):
for k, old_event_id in old_room_state_ids.items():
old_event = old_room_state_events.get(old_event_id)
if old_event:
initial_state[k] = old_event.content
@ -430,7 +430,7 @@ class RoomCreationHandler(BaseHandler):
old_room_member_state_events = await self.store.get_events(
old_room_member_state_ids.values()
)
for k, old_event in iteritems(old_room_member_state_events):
for k, old_event in old_room_member_state_events.items():
# Only transfer ban events
if (
"membership" in old_event.content