summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2016-08-30 16:30:12 +0100
committerKegan Dougal <kegan@matrix.org>2016-08-30 16:30:12 +0100
commit16b652f0a375a880175b54d5d439bde6a0604dd2 (patch)
tree6c3b235df6b2e2b8d78fe062ac6a24f157c64734 /synapse
parentAllow application services to have an optional 'url' (diff)
downloadsynapse-16b652f0a375a880175b54d5d439bde6a0604dd2.tar.xz
Flake8
Diffstat (limited to 'synapse')
-rw-r--r--synapse/appservice/api.py1
-rw-r--r--synapse/config/appservice.py3
2 files changed, 3 insertions, 1 deletions
diff --git a/synapse/appservice/api.py b/synapse/appservice/api.py
index e596cb7376..ee63f06359 100644
--- a/synapse/appservice/api.py
+++ b/synapse/appservice/api.py
@@ -153,6 +153,7 @@ class ApplicationServiceApi(SimpleHttpClient):
     def get_3pe_protocol(self, service, protocol):
         if service.url == "":
             defer.returnValue({})
+
         @defer.inlineCallbacks
         def _get():
             uri = "%s%s/thirdparty/protocol/%s" % (
diff --git a/synapse/config/appservice.py b/synapse/config/appservice.py
index 3488a28ff2..5569c43b35 100644
--- a/synapse/config/appservice.py
+++ b/synapse/config/appservice.py
@@ -135,7 +135,8 @@ def _load_appservice(hostname, as_info, config_filename):
 
     if as_info["url"] == "":
         logger.info(
-            "(%s) Explicitly empty 'url' provided. This application service will not receive events or queries.",
+            "(%s) Explicitly empty 'url' provided. This application service " +
+            "will not receive events or queries.",
             config_filename,
         )
     return ApplicationService(