diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-12 11:42:43 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-12 11:42:43 +0000 |
| commit | 1ed836cc2b909e0bcd439964173008e9755c4750 (patch) | |
| tree | 65862dbcf81107332c0c7c65a2eda86eb6afc9ba /synapse/util/frozenutils.py | |
| parent | Merge pull request #59 from matrix-org/hotfixes-v0.6.1f (diff) | |
| parent | Expand on caching (diff) | |
| download | synapse-1ed836cc2b909e0bcd439964173008e9755c4750.tar.xz | |
Merge branch 'release-v0.7.0' of github.com:matrix-org/synapse v0.7.0
Diffstat (limited to 'synapse/util/frozenutils.py')
| -rw-r--r-- | synapse/util/frozenutils.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/synapse/util/frozenutils.py b/synapse/util/frozenutils.py index a13a2015e4..9e10d37aec 100644 --- a/synapse/util/frozenutils.py +++ b/synapse/util/frozenutils.py @@ -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: |