diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-05-30 12:44:46 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-30 12:44:46 +1000 |
| commit | debff7ae092231652d5bb937845f316bcc72f845 (patch) | |
| tree | 51e39c6acde568437807ee40c32b6f211b13e365 /synapse/util/frozenutils.py | |
| parent | Update some comments and docstrings in SyncHandler (diff) | |
| parent | pep8 (diff) | |
| download | synapse-debff7ae092231652d5bb937845f316bcc72f845.tar.xz | |
Merge pull request #3281 from NotAFile/py3-six-isinstance
remaining isintance fixes
Diffstat (limited to 'synapse/util/frozenutils.py')
| -rw-r--r-- | synapse/util/frozenutils.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/synapse/util/frozenutils.py b/synapse/util/frozenutils.py index f497b51f4a..15f0a7ba9e 100644 --- a/synapse/util/frozenutils.py +++ b/synapse/util/frozenutils.py @@ -16,16 +16,17 @@ from frozendict import frozendict import simplejson as json +from six import string_types + def freeze(o): - t = type(o) - if t is dict: + if isinstance(o, dict): return frozendict({k: freeze(v) for k, v in o.items()}) - if t is frozendict: + if isinstance(o, frozendict): return o - if t is str or t is unicode: + if isinstance(o, string_types): return o try: @@ -37,11 +38,10 @@ def freeze(o): def unfreeze(o): - t = type(o) - if t is dict or t is frozendict: + if isinstance(o, (dict, frozendict)): return dict({k: unfreeze(v) for k, v in o.items()}) - if t is str or t is unicode: + if isinstance(o, string_types): return o try: |