From ef3a5ae787e2fa25cc753b7c5dc9f31ba3bf4316 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 27 Sep 2017 11:24:19 +0100
Subject: [PATCH] Don't test is spam_checker not None

Sometimes it's a Mock object which is not none but is still not
what we're after
---
 synapse/events/spamcheck.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/synapse/events/spamcheck.py b/synapse/events/spamcheck.py
index 8ddbf2ca38..e739f105b2 100644
--- a/synapse/events/spamcheck.py
+++ b/synapse/events/spamcheck.py
@@ -18,8 +18,14 @@ class SpamChecker(object):
     def __init__(self, hs):
         self.spam_checker = None
 
-        if hs.config.spam_checker is not None:
+        module = None
+        config = None
+        try:
             module, config = hs.config.spam_checker
+        except:
+            pass
+
+        if module is not None:
             self.spam_checker = module(config=config)
 
     def check_event_for_spam(self, event):