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

Appease pep8

Browse source
This commit is contained in:
Paul "LeoNerd" Evans 2015-03-05 20:53:33 +00:00
parent 5eab2549ab
commit d79d91a4a7
1 changed files with 27 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
synapse/federation/transport/server.py
View file

@ -102,7 +102,8 @@ class TransportLayerServer(object):
Args: Args:
handler (TransportReceivedHandler) handler (TransportReceivedHandler)
""" """
FederationSendServlet(handler, FederationSendServlet(
handler,
authenticator=self, authenticator=self,
ratelimiter=self.ratelimiter, ratelimiter=self.ratelimiter,
server_name=self.server_name, server_name=self.server_name,
@ -115,20 +116,9 @@ class TransportLayerServer(object):
Args: Args:
handler (TransportRequestHandler) handler (TransportRequestHandler)
""" """
for servletclass in ( for servletclass in SERVLET_CLASSES:
FederationPullServlet, servletclass(
FederationEventServlet, handler,
FederationStateServlet,
FederationBackfillServlet,
FederationQueryServlet,
FederationMakeJoinServlet,
FederationEventServlet,
FederationSendJoinServlet,
FederationInviteServlet,
FederationQueryAuthServlet,
FederationGetMissingEventsServlet,
):
servletclass(handler,
authenticator=self, authenticator=self,
ratelimiter=self.ratelimiter, ratelimiter=self.ratelimiter,
).register(self.server) ).register(self.server)
@ -138,11 +128,11 @@ class BaseFederationServlet(object):
def __init__(self, handler, authenticator, ratelimiter): def __init__(self, handler, authenticator, ratelimiter):
self.handler = handler self.handler = handler
self.authenticator = authenticator self.authenticator = authenticator
self.ratelimiter = ratelimiter self.ratelimiter = ratelimiter
def _wrap(self, code): def _wrap(self, code):
authenticator = self.authenticator authenticator = self.authenticator
ratelimiter = self.ratelimiter ratelimiter = self.ratelimiter
@defer.inlineCallbacks @defer.inlineCallbacks
@functools.wraps(code) @functools.wraps(code)
@ -249,7 +239,9 @@ class FederationStateServlet(BaseFederationServlet):
# This is when someone asks for all data for a given context. # This is when someone asks for all data for a given context.
def on_GET(self, origin, content, query, context): def on_GET(self, origin, content, query, context):
return self.handler.on_context_state_request(origin, context, return self.handler.on_context_state_request(
origin,
context,
query.get("event_id", [None])[0], query.get("event_id", [None])[0],
) )
@ -274,7 +266,8 @@ class FederationQueryServlet(BaseFederationServlet):
# This is when we receive a server-server Query # This is when we receive a server-server Query
def on_GET(self, origin, content, query, query_type): def on_GET(self, origin, content, query, query_type):
return self.handler.on_query_request(query_type, return self.handler.on_query_request(
query_type,
{k: v[0].decode("utf-8") for k, v in query.items()} {k: v[0].decode("utf-8") for k, v in query.items()}
) )
@ -350,3 +343,18 @@ class FederationGetMissingEventsServlet(BaseFederationServlet):
) )
defer.returnValue((200, content)) defer.returnValue((200, content))
SERVLET_CLASSES = (
FederationPullServlet,
FederationEventServlet,
FederationStateServlet,
FederationBackfillServlet,
FederationQueryServlet,
FederationMakeJoinServlet,
FederationEventServlet,
FederationSendJoinServlet,
FederationInviteServlet,
FederationQueryAuthServlet,
FederationGetMissingEventsServlet,
)