diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py
index 5c655c5373..d77f045406 100644
--- a/synapse/config/homeserver.py
+++ b/synapse/config/homeserver.py
@@ -27,6 +27,7 @@ from .appservice import AppServiceConfig
from .key import KeyConfig
from .saml2 import SAML2Config
+
class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig,
RatelimitConfig, ContentRepositoryConfig, CaptchaConfig,
VoipConfig, RegistrationConfig, MetricsConfig,
diff --git a/synapse/config/saml2.py b/synapse/config/saml2.py
index 4f3a724e27..d18d076a89 100644
--- a/synapse/config/saml2.py
+++ b/synapse/config/saml2.py
@@ -15,6 +15,7 @@
from ._base import Config
+
class SAML2Config(Config):
def read_config(self, config):
self.saml2_config = config["saml2_config"]
@@ -24,4 +25,4 @@ class SAML2Config(Config):
saml2_config:
config_path: "%s/sp_conf.py"
idp_redirect_url: "http://%s/idp"
- """%(config_dir_path, server_name)
+ """ % (config_dir_path, server_name)
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py
index 4c6c5e2972..a1288b4252 100644
--- a/synapse/handlers/register.py
+++ b/synapse/handlers/register.py
@@ -220,7 +220,6 @@ class RegistrationHandler(BaseHandler):
# Ignore Registration errors
logger.exception(e)
defer.returnValue((user_id, token))
-
@defer.inlineCallbacks
def register_email(self, threepidCreds):
|
