diff options
| author | David Baker <dave@matrix.org> | 2018-05-24 16:20:53 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2018-05-24 16:20:53 +0100 |
| commit | 77a23e2e058bbc02a675bd6e14bff2c9906c68b2 (patch) | |
| tree | 5b65ad8562dc2d584b35b47999b5e004ad21b387 /synapse/push | |
| parent | pep8 (diff) | |
| parent | Merge pull request #3277 from matrix-org/dbkr/remove_from_user_dir (diff) | |
| download | synapse-77a23e2e058bbc02a675bd6e14bff2c9906c68b2.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/unbind
Diffstat (limited to 'synapse/push')
| -rw-r--r-- | synapse/push/push_rule_evaluator.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/push/push_rule_evaluator.py b/synapse/push/push_rule_evaluator.py index 3601f2d365..d55efde8cc 100644 --- a/synapse/push/push_rule_evaluator.py +++ b/synapse/push/push_rule_evaluator.py @@ -21,6 +21,8 @@ from synapse.types import UserID from synapse.util.caches import CACHE_SIZE_FACTOR, register_cache from synapse.util.caches.lrucache import LruCache +from six import string_types + logger = logging.getLogger(__name__) @@ -238,7 +240,7 @@ def _flatten_dict(d, prefix=[], result=None): if result is None: result = {} for key, value in d.items(): - if isinstance(value, basestring): + if isinstance(value, string_types): result[".".join(prefix + [key])] = value.lower() elif hasattr(value, "items"): _flatten_dict(value, prefix=(prefix + [key]), result=result) |