diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-09-03 21:08:35 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-03 21:08:35 +1000 |
| commit | 4fc4b881c58fd638db5f4dac0863721111b67af0 (patch) | |
| tree | cc1604f5e3b4e0a263e0e11a55b62ef4006a64a1 /synapse/util/frozenutils.py | |
| parent | The project `matrix-synapse-auto-deploy` does not seem to be maintained anymore. (diff) | |
| parent | Merge pull request #3777 from matrix-org/neilj/fix_register_user_registration (diff) | |
| download | synapse-4fc4b881c58fd638db5f4dac0863721111b67af0.tar.xz | |
Merge branch 'develop' into develop
Diffstat (limited to 'synapse/util/frozenutils.py')
| -rw-r--r-- | synapse/util/frozenutils.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/synapse/util/frozenutils.py b/synapse/util/frozenutils.py index 15f0a7ba9e..014edea971 100644 --- a/synapse/util/frozenutils.py +++ b/synapse/util/frozenutils.py @@ -13,10 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from frozendict import frozendict -import simplejson as json +from six import binary_type, text_type -from six import string_types +from canonicaljson import json +from frozendict import frozendict def freeze(o): @@ -26,7 +26,7 @@ def freeze(o): if isinstance(o, frozendict): return o - if isinstance(o, string_types): + if isinstance(o, (binary_type, text_type)): return o try: @@ -41,7 +41,7 @@ def unfreeze(o): if isinstance(o, (dict, frozendict)): return dict({k: unfreeze(v) for k, v in o.items()}) - if isinstance(o, string_types): + if isinstance(o, (binary_type, text_type)): return o try: |