diff options
| author | David Baker <dave@matrix.org> | 2015-01-13 13:15:51 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2015-01-13 13:15:51 +0000 |
| commit | c06a9063e1d838f776edfd79cfc8ab29c748d794 (patch) | |
| tree | bcfa472e65d4dacbab666d5787eff9293e5ccc41 /synapse/util/frozenutils.py | |
| parent | Split out function to decide whether to notify or a given event (diff) | |
| parent | Merge branch 'hotfixes-v0.6.1b' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-c06a9063e1d838f776edfd79cfc8ab29c748d794.tar.xz | |
Merge branch 'develop' into pushers
Diffstat (limited to 'synapse/util/frozenutils.py')
| -rw-r--r-- | synapse/util/frozenutils.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/synapse/util/frozenutils.py b/synapse/util/frozenutils.py index fcfb38b3b4..a13a2015e4 100644 --- a/synapse/util/frozenutils.py +++ b/synapse/util/frozenutils.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2014 OpenMarket Ltd +# Copyright 2014, 2015 OpenMarket Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,10 +17,11 @@ from frozendict import frozendict def freeze(o): - if isinstance(o, dict) or isinstance(o, frozendict): + t = type(o) + if t is dict: return frozendict({k: freeze(v) for k, v in o.items()}) - if isinstance(o, basestring): + if t is str or t is unicode: return o try: |