summary refs log tree commit diff
path: root/synapse/types.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-09-20 10:57:07 +0100
committerGitHub <noreply@github.com>2019-09-20 10:57:07 +0100
commit07eb311b11680dfcec8bd5ef26396dd7f051a5b8 (patch)
tree5c6325638b515bdbe4de6ebb1100efac9a335c11 /synapse/types.py
parentMerge pull request #2 from matrix-org/babolivier/dinsic-3pid-invite (diff)
parentRemove unnecessary cast to list (diff)
downloadsynapse-07eb311b11680dfcec8bd5ef26396dd7f051a5b8.tar.xz
Merge pull request #4 from matrix-org/babolivier/strip_invalid_mxid_characters
Fix handling of filtered strings in Python 3 when processing MXIDs
Diffstat (limited to 'synapse/types.py')
-rw-r--r--synapse/types.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/types.py b/synapse/types.py

index eebe29d1f0..e6afc05cee 100644 --- a/synapse/types.py +++ b/synapse/types.py
@@ -16,6 +16,8 @@ import re import string from collections import namedtuple +from six.moves import filter + import attr from synapse.api.errors import SynapseError @@ -240,7 +242,8 @@ def strip_invalid_mxid_characters(localpart): Returns: localpart (basestring): the localpart having been stripped """ - return filter(lambda c: c in mxid_localpart_allowed_characters, localpart) + filtered = filter(lambda c: c in mxid_localpart_allowed_characters, localpart) + return "".join(filtered) UPPER_CASE_PATTERN = re.compile(b"[A-Z_]")