Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-08-01 14:06:06 -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

8
synapse/handlers/message.py
View file

@ -17,7 +17,7 @@
import logging
from typing import Optional, Tuple
from six import iteritems, itervalues, string_types
from six import string_types
from canonicaljson import encode_canonical_json, json
@ -246,7 +246,7 @@ class MessageHandler(object):
"avatar_url": profile.avatar_url,
"display_name": profile.display_name,
}
for user_id, profile in iteritems(users_with_profile)
for user_id, profile in users_with_profile.items()
}
def maybe_schedule_expiry(self, event):
@ -988,7 +988,7 @@ class EventCreationHandler(object):
state_to_include_ids = [
e_id
for k, e_id in iteritems(current_state_ids)
for k, e_id in current_state_ids.items()
if k[0] in self.room_invite_state_types
or k == (EventTypes.Member, event.sender)
]
@ -1002,7 +1002,7 @@ class EventCreationHandler(object):
"content": e.content,
"sender": e.sender,
}
for e in itervalues(state_to_include)
for e in state_to_include.values()
]
invitee = UserID.from_string(event.state_key)