summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2016-11-22 10:39:41 +0000
committerKegan Dougal <kegan@matrix.org>2016-11-22 10:39:41 +0000
commit6d4e6d4cbac6f22457b2d5946c3dd7a7ea87ba3f (patch)
treec2196e6f499f5eaf52714ff15bc2d6608034fee0 /synapse
parentGlue only_event_fields into the sync rest servlet (diff)
downloadsynapse-6d4e6d4cbac6f22457b2d5946c3dd7a7ea87ba3f.tar.xz
Also check for dict since sometimes they aren't frozen
Diffstat (limited to 'synapse')
-rw-r--r--synapse/events/utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/events/utils.py b/synapse/events/utils.py
index ce4fe55204..f4b21ca517 100644
--- a/synapse/events/utils.py
+++ b/synapse/events/utils.py
@@ -132,7 +132,7 @@ def _copy_field(src, dst, field):
     key_to_move = field.pop(-1)
     sub_dict = src
     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]
         else:
             return