Merge branch 'erikj-perf' of github.com:matrix-org/synapse into develop

1 files changed, 3 insertions, 2 deletions

diff --git a/synapse/util/frozenutils.py b/synapse/util/frozenutils.py

index 061f79d79d..a13a2015e4 100644
--- a/synapse/util/frozenutils.py
+++ b/synapse/util/frozenutils.py
@@ -17,10 +17,11 @@ from frozendict import frozendict
 
 
 def freeze(o):
-    if isinstance(o, dict) or isinstance(o, frozendict):
+    t = type(o)
+    if t is dict:
         return frozendict({k: freeze(v) for k, v in o.items()})
 
-    if isinstance(o, basestring):
+    if t is str or t is unicode:
         return o
 
     try: