OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

fix recursion error

pull/3281/head
Adrian Tschira 2018-05-24 21:44:10 +02:00
parent dd068ca979
commit 4ee4450d66
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
synapse/util/frozenutils.py
View File

@ -19,14 +19,13 @@ import simplejson as json
from six import string_types from six import string_types
def freeze(o): def freeze(o):
t = type(o) if isinstance(o, dict):
if t is dict:
return frozendict({k: freeze(v) for k, v in o.items()}) return frozendict({k: freeze(v) for k, v in o.items()})
if t is frozendict: if isinstance(o, frozendict):
return o return o
if isinstance(t, string_types): if isinstance(o, string_types):
return o return o
try: try:
@ -38,11 +37,10 @@ def freeze(o):
def unfreeze(o): def unfreeze(o):
t = type(o) if isinstance(o, (dict, frozendict)):
if t is dict or t is frozendict:
return dict({k: unfreeze(v) for k, v in o.items()}) return dict({k: unfreeze(v) for k, v in o.items()})
if isinstance(t, string_types): if isinstance(o, string_types):
return o return o
try: try: