From 6d4e6d4cbac6f22457b2d5946c3dd7a7ea87ba3f Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Tue, 22 Nov 2016 10:39:41 +0000
Subject: [PATCH] Also check for dict since sometimes they aren't frozen
---
synapse/events/utils.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
--
GitLab