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/groups/groups_server.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/groups/groups_server.py')
| -rw-r--r-- | synapse/groups/groups_server.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/groups/groups_server.py b/synapse/groups/groups_server.py index 2d95b04e0c..62d20ad130 100644 --- a/synapse/groups/groups_server.py +++ b/synapse/groups/groups_server.py @@ -20,6 +20,8 @@ from synapse.api.errors import SynapseError from synapse.types import GroupID, RoomID, UserID, get_domain_from_id from twisted.internet import defer +from six import string_types + logger = logging.getLogger(__name__) @@ -431,7 +433,7 @@ class GroupsServerHandler(object): "long_description"): if keyname in content: value = content[keyname] - if not isinstance(value, basestring): + if not isinstance(value, string_types): raise SynapseError(400, "%r value is not a string" % (keyname,)) profile[keyname] = value |