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/events/utils.py | |
| 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/events/utils.py')
| -rw-r--r-- | synapse/events/utils.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/events/utils.py b/synapse/events/utils.py index 824f4a42e3..29ae086786 100644 --- a/synapse/events/utils.py +++ b/synapse/events/utils.py @@ -20,6 +20,8 @@ from frozendict import frozendict import re +from six import string_types + # Split strings on "." but not "\." This uses a negative lookbehind assertion for '\' # (?<!stuff) matches if the current position in the string is not preceded # by a match for 'stuff'. @@ -277,7 +279,7 @@ def serialize_event(e, time_now_ms, as_client_event=True, if only_event_fields: if (not isinstance(only_event_fields, list) or - not all(isinstance(f, basestring) for f in only_event_fields)): + not all(isinstance(f, string_types) for f in only_event_fields)): raise TypeError("only_event_fields must be a list of strings") d = only_fields(d, only_event_fields) |