rei-mirrors
/
synapse
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Also check for dict since sometimes they aren't frozen

This commit is contained in:
Kegan Dougal 2016-11-22 10:39:41 +00:00
parent cea4e4e7b2
commit 6d4e6d4cba
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/events/utils.py
View File

@ -132,7 +132,7 @@ def _copy_field(src, dst, field):
key_to_move = field.pop(-1) key_to_move = field.pop(-1)
sub_dict = src sub_dict = src
for sub_field in field: # e.g. sub_field => "content" for sub_field in field: # e.g. sub_field => "content"
if sub_field in sub_dict and type(sub_dict[sub_field]) == frozendict: if sub_field in sub_dict and type(sub_dict[sub_field]) in [dict, frozendict]:
sub_dict = sub_dict[sub_field] sub_dict = sub_dict[sub_field]
else: else:
return return