diff --git a/synapse/appservice/api.py b/synapse/appservice/api.py
index 15ac1e27fc..6192813c03 100644
--- a/synapse/appservice/api.py
+++ b/synapse/appservice/api.py
@@ -71,7 +71,6 @@ class ApplicationServiceApi(SimpleHttpClient):
logger.warning("query_alias to %s threw exception %s", uri, ex)
defer.returnValue(False)
-
@defer.inlineCallbacks
def push_bulk(self, service, events):
events = self._serialize(events)
@@ -107,4 +106,3 @@ class ApplicationServiceApi(SimpleHttpClient):
return [
serialize_event(e, time_now, as_client_event=True) for e in events
]
-
diff --git a/synapse/handlers/directory.py b/synapse/handlers/directory.py
index 87bc12c983..20ab9e269c 100644
--- a/synapse/handlers/directory.py
+++ b/synapse/handlers/directory.py
@@ -58,7 +58,6 @@ class DirectoryHandler(BaseHandler):
servers
)
-
@defer.inlineCallbacks
def create_association(self, user_id, room_alias, room_id, servers=None):
# association creation for human users
@@ -75,7 +74,6 @@ class DirectoryHandler(BaseHandler):
)
yield self._create_association(room_alias, room_id, servers)
-
@defer.inlineCallbacks
def create_appservice_association(self, service, room_alias, room_id,
servers=None):
@@ -127,7 +125,6 @@ class DirectoryHandler(BaseHandler):
# if room_id:
# yield self._update_room_alias_events(user_id, room_id)
-
@defer.inlineCallbacks
def get_association(self, room_alias):
room_id = None
diff --git a/synapse/rest/appservice/v1/register.py b/synapse/rest/appservice/v1/register.py
index d3d5aef220..3bd0c1220c 100644
--- a/synapse/rest/appservice/v1/register.py
+++ b/synapse/rest/appservice/v1/register.py
@@ -65,7 +65,7 @@ class RegisterRestServlet(AppServiceRestServlet):
hs_token = app_service.hs_token
defer.returnValue((200, {
- "hs_token": hs_token
+ "hs_token": hs_token
}))
def _parse_namespace(self, target_ns, origin_ns, ns):
diff --git a/synapse/storage/appservice.py b/synapse/storage/appservice.py
index ba31c68595..d941b1f387 100644
--- a/synapse/storage/appservice.py
+++ b/synapse/storage/appservice.py
@@ -97,7 +97,6 @@ class ApplicationServiceStore(SQLBaseStore):
# allocate new ASes. It relies on the server admin inserting the AS
# token into the database manually.
-
if not service.token or not service.url:
raise StoreError(400, "Token and url must be specified.")
@@ -186,7 +185,6 @@ class ApplicationServiceStore(SQLBaseStore):
# TODO: The from_cache=False impl
# TODO: This should be JOINed with the application_services_regex table.
-
@defer.inlineCallbacks
def _populate_cache(self):
"""Populates the ApplicationServiceCache from the database."""
@@ -244,4 +242,3 @@ class ApplicationServiceStore(SQLBaseStore):
hs_token=service["hs_token"],
sender=service["sender"]
))
-
|
