tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

code beautify

Browse source
This commit is contained in:
Muthu Subramanian 2015-07-08 16:05:46 +05:30
parent 77c5db5977
commit f53bae0c19
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
synapse/config/homeserver.py
View file

@ -27,6 +27,7 @@ from .appservice import AppServiceConfig
from .key import KeyConfig from .key import KeyConfig
from .saml2 import SAML2Config from .saml2 import SAML2Config
class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig,
RatelimitConfig, ContentRepositoryConfig, CaptchaConfig, RatelimitConfig, ContentRepositoryConfig, CaptchaConfig,
VoipConfig, RegistrationConfig, MetricsConfig, VoipConfig, RegistrationConfig, MetricsConfig,

3
synapse/config/saml2.py
View file

@ -15,6 +15,7 @@
from ._base import Config from ._base import Config
class SAML2Config(Config): class SAML2Config(Config):
def read_config(self, config): def read_config(self, config):
self.saml2_config = config["saml2_config"] self.saml2_config = config["saml2_config"]
@ -24,4 +25,4 @@ class SAML2Config(Config):
saml2_config: saml2_config:
config_path: "%s/sp_conf.py" config_path: "%s/sp_conf.py"
idp_redirect_url: "http://%s/idp" idp_redirect_url: "http://%s/idp"
"""%(config_dir_path, server_name) """ % (config_dir_path, server_name)

1
synapse/handlers/register.py
View file

@ -220,7 +220,6 @@ class RegistrationHandler(BaseHandler):
# Ignore Registration errors # Ignore Registration errors
logger.exception(e) logger.exception(e)
defer.returnValue((user_id, token)) defer.returnValue((user_id, token))
@defer.inlineCallbacks @defer.inlineCallbacks
def register_email(self, threepidCreds): def register_email(self, threepidCreds):