Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 10:06:05 -04:00
Code Issues Projects Releases Packages Wiki Activity

Don't unfreeze when using FreezeEvent.get_dict, as we are using a JSONEncoder that understands FrozenDict

Browse source
This commit is contained in:
Erik Johnston 2015-02-11 15:44:28 +00:00
parent 4ebbaf0d43
commit ddb816cf60
6 changed files with 36 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
synapse/util/frozenutils.py
View file

@ -21,6 +21,9 @@ def freeze(o):
if t is dict:
return frozendict({k: freeze(v) for k, v in o.items()})
if t is frozendict:
return o
if t is str or t is unicode:
return o
@ -33,10 +36,11 @@ def freeze(o):
def unfreeze(o):
if isinstance(o, frozendict) or isinstance(o, dict):
t = type(o)
if t is dict or t is frozendict:
return dict({k: unfreeze(v) for k, v in o.items()})
if isinstance(o, basestring):
if t is str or t is unicode:
return o
try: