From b78bae2d51bac7e1f75365d85cd67402adb5f408 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 11 Oct 2017 14:49:09 +0100
Subject: [PATCH] fix isinstance

---
 synapse/handlers/message.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index 06672df3b..28792788d 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -328,7 +328,7 @@ class MessageHandler(BaseHandler):
 
         spam_error = self.spam_checker.check_event_for_spam(event)
         if spam_error:
-            if not isinstance(spam_error, (str, basestring)):
+            if not isinstance(spam_error, basestring):
                 spam_error = "Spam is not permitted here"
             raise SynapseError(
                 403, spam_error, Codes.FORBIDDEN