summary refs log tree commit diff
path: root/synapse/events/validator.py
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/events/validator.py
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/events/validator.py')
-rw-r--r--synapse/events/validator.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/events/validator.py b/synapse/events/validator.py
index 2f4c8a1018..e0e5bf818c 100644
--- a/synapse/events/validator.py
+++ b/synapse/events/validator.py
@@ -17,6 +17,8 @@ from synapse.types import EventID, RoomID, UserID
 from synapse.api.errors import SynapseError
 from synapse.api.constants import EventTypes, Membership
 
+from six import string_types
+
 
 class EventValidator(object):
 
@@ -49,7 +51,7 @@ class EventValidator(object):
             strings.append("state_key")
 
         for s in strings:
-            if not isinstance(getattr(event, s), basestring):
+            if not isinstance(getattr(event, s), string_types):
                 raise SynapseError(400, "Not '%s' a string type" % (s,))
 
         if event.type == EventTypes.Member:
@@ -88,5 +90,5 @@ class EventValidator(object):
         for s in keys:
             if s not in d:
                 raise SynapseError(400, "'%s' not in content" % (s,))
-            if not isinstance(d[s], basestring):
+            if not isinstance(d[s], string_types):
                 raise SynapseError(400, "Not '%s' a string type" % (s,))