summary refs log tree commit diff
path: root/synapse/config/server.py
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2019-01-22 17:47:00 +0000
committerNeil Johnson <neil@matrix.org>2019-01-22 17:47:00 +0000
commitc99c2d58d775a7a7bcbcae426fed608d6a0e8ee3 (patch)
treed58f70cc03c5bfbac2511a2facbefea084eda72e /synapse/config/server.py
parentFix None guard in config.server.is_threepid_reserved (diff)
downloadsynapse-c99c2d58d775a7a7bcbcae426fed608d6a0e8ee3.tar.xz
move guard out of is_threepid_reserved and into register.py
Diffstat (limited to 'synapse/config/server.py')
-rw-r--r--synapse/config/server.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py
index 927c54ee5b..a915bb8b64 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -429,8 +429,6 @@ def is_threepid_reserved(reserved_threepids, threepid):
     Returns:
         boolean Is the threepid undertest reserved_user
     """
-    if not threepid:
-        return False
 
     for tp in reserved_threepids:
         if (threepid['medium'] == tp['medium'] and threepid['address'] == tp['address']):