summary refs log tree commit diff
path: root/synapse/groups
diff options
context:
space:
mode:
authorAdrian Tschira <nota@notafile.com>2018-04-15 21:43:35 +0200
committerAdrian Tschira <nota@notafile.com>2018-05-19 17:56:31 +0200
commitd9fe2b2d9dbb539da32f969b8bd752159fd5eb6f (patch)
treeed9440ba4276d0a6aba07c6560fa19b4e0a25be0 /synapse/groups
parentMerge pull request #3241 from matrix-org/fix_user_visits_insertion (diff)
downloadsynapse-d9fe2b2d9dbb539da32f969b8bd752159fd5eb6f.tar.xz
Replace some more comparisons with six
plus a bonus b"" string I missed last time

Signed-off-by: Adrian Tschira <nota@notafile.com>
Diffstat (limited to 'synapse/groups')
-rw-r--r--synapse/groups/groups_server.py4
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