diff --git a/synapse/api/auth.py b/synapse/api/auth.py
index 6d8a9e4df7..cbf3ae0ca4 100644
--- a/synapse/api/auth.py
+++ b/synapse/api/auth.py
@@ -272,7 +272,7 @@ class Auth(object):
key = (RoomCreateEvent.TYPE, "", )
create_event = event.old_state_events.get(key)
if (create_event is not None and
- create_event.content["creator"] == user_id):
+ create_event.content["creator"] == user_id):
return 100
return level
diff --git a/synapse/api/events/validator.py b/synapse/api/events/validator.py
index 2d4f2a3aa7..067215f6ef 100644
--- a/synapse/api/events/validator.py
+++ b/synapse/api/events/validator.py
@@ -84,4 +84,4 @@ class EventValidator(object):
template[key][0]
)
if msg:
- return msg
\ No newline at end of file
+ return msg
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index fddb24b520..133b4521ba 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -257,13 +257,16 @@ def setup():
else:
reactor.run()
+
def run():
with LoggingContext("run"):
reactor.run()
+
def main():
with LoggingContext("main"):
setup()
+
if __name__ == '__main__':
main()
diff --git a/synapse/app/synctl.py b/synapse/app/synctl.py
index abe055a64c..52a0b729f4 100755
--- a/synapse/app/synctl.py
+++ b/synapse/app/synctl.py
@@ -21,11 +21,12 @@ import signal
SYNAPSE = ["python", "-m", "synapse.app.homeserver"]
-CONFIGFILE="homeserver.yaml"
-PIDFILE="homeserver.pid"
+CONFIGFILE = "homeserver.yaml"
+PIDFILE = "homeserver.pid"
+
+GREEN = "\x1b[1;32m"
+NORMAL = "\x1b[m"
-GREEN="\x1b[1;32m"
-NORMAL="\x1b[m"
def start():
if not os.path.exists(CONFIGFILE):
@@ -43,12 +44,14 @@ def start():
subprocess.check_call(args)
print GREEN + "started" + NORMAL
+
def stop():
if os.path.exists(PIDFILE):
pid = int(open(PIDFILE).read())
os.kill(pid, signal.SIGTERM)
print GREEN + "stopped" + NORMAL
+
def main():
action = sys.argv[1] if sys.argv[1:] else "usage"
if action == "start":
@@ -62,5 +65,6 @@ def main():
sys.stderr.write("Usage: %s [start|stop|restart]\n" % (sys.argv[0],))
sys.exit(1)
-if __name__=='__main__':
+
+if __name__ == "__main__":
main()
diff --git a/synapse/federation/replication.py b/synapse/federation/replication.py
index 996b8ea5bf..124dc31225 100644
--- a/synapse/federation/replication.py
+++ b/synapse/federation/replication.py
@@ -427,7 +427,9 @@ class ReplicationLayer(object):
time_now = self._clock.time_msec()
defer.returnValue((200, {
"state": [p.get_pdu_json(time_now) for p in res_pdus["state"]],
- "auth_chain": [p.get_pdu_json(time_now) for p in res_pdus["auth_chain"]],
+ "auth_chain": [
+ p.get_pdu_json(time_now) for p in res_pdus["auth_chain"]
+ ],
}))
@defer.inlineCallbacks
@@ -438,7 +440,9 @@ class ReplicationLayer(object):
(
200,
{
- "auth_chain": [a.get_pdu_json(time_now) for a in auth_pdus],
+ "auth_chain": [
+ a.get_pdu_json(time_now) for a in auth_pdus
+ ],
}
)
)
@@ -459,7 +463,7 @@ class ReplicationLayer(object):
@defer.inlineCallbacks
def send_join(self, destination, pdu):
- time_now = self._clock.time_msec()
+ time_now = self._clock.time_msec()
_, content = yield self.transport_layer.send_join(
destination,
pdu.room_id,
diff --git a/synapse/federation/units.py b/synapse/federation/units.py
index 6e708edb8c..1bcd0548c2 100644
--- a/synapse/federation/units.py
+++ b/synapse/federation/units.py
@@ -25,7 +25,6 @@ import logging
logger = logging.getLogger(__name__)
-
class Edu(JsonEncodedObject):
""" An Edu represents a piece of data sent from one homeserver to another.
diff --git a/synapse/handlers/directory.py b/synapse/handlers/directory.py
index 05e5c6ecfc..af4e7d49c8 100644
--- a/synapse/handlers/directory.py
+++ b/synapse/handlers/directory.py
@@ -128,8 +128,9 @@ class DirectoryHandler(BaseHandler):
"servers": result.servers,
})
else:
- raise SynapseError(404, "Room alias \"%s\" not found" % (room_alias,))
-
+ raise SynapseError(
+ 404, "Room alias \"%s\" not found" % (room_alias,)
+ )
@defer.inlineCallbacks
def send_room_alias_update_event(self, user_id, room_id):
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index e8fb7eae58..2e8b8a1f9a 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -122,7 +122,8 @@ class FederationHandler(BaseHandler):
event.origin, redacted_pdu_json
)
except SynapseError as e:
- logger.warn("Signature check failed for %s redacted to %s",
+ logger.warn(
+ "Signature check failed for %s redacted to %s",
encode_canonical_json(pdu.get_pdu_json()),
encode_canonical_json(redacted_pdu_json),
)
@@ -390,7 +391,8 @@ class FederationHandler(BaseHandler):
event.outlier = False
- is_new_state = yield self.state_handler.annotate_event_with_state(event)
+ state_handler = self.state_handler
+ is_new_state = yield state_handler.annotate_event_with_state(event)
self.auth.check(event, raises=True)
# FIXME (erikj): All this is duplicated above :(
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index f460657f31..06a4e173f6 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -298,7 +298,7 @@ class MessageHandler(BaseHandler):
@defer.inlineCallbacks
def room_initial_sync(self, user_id, room_id, pagin_config=None,
- feedback=False):
+ feedback=False):
yield self.auth.check_joined_room(room_id, user_id)
# TODO(paul): I wish I was called with user objects not user_id
@@ -342,8 +342,8 @@ class MessageHandler(BaseHandler):
)
presence.append(member_presence)
except Exception:
- logger.exception("Failed to get member presence of %r",
- m.user_id
+ logger.exception(
+ "Failed to get member presence of %r", m.user_id
)
defer.returnValue({
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 7252051744..88955160c5 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -178,7 +178,9 @@ class RoomCreationHandler(BaseHandler):
if room_alias:
result["room_alias"] = room_alias.to_string()
- yield directory_handler.send_room_alias_update_event(user_id, room_id)
+ yield directory_handler.send_room_alias_update_event(
+ user_id, room_id
+ )
defer.returnValue(result)
@@ -211,7 +213,6 @@ class RoomCreationHandler(BaseHandler):
**event_keys
)
-
power_levels_event = self.event_factory.create_event(
etype=RoomPowerLevelsEvent.TYPE,
content={
diff --git a/synapse/http/content_repository.py b/synapse/http/content_repository.py
index 1306b35271..7e046dfe49 100644
--- a/synapse/http/content_repository.py
+++ b/synapse/http/content_repository.py
@@ -131,12 +131,14 @@ class ContentRepoResource(resource.Resource):
request.setHeader('Content-Type', content_type)
# cache for at least a day.
- # XXX: we might want to turn this off for data we don't want to recommend
- # caching as it's sensitive or private - or at least select private.
- # don't bother setting Expires as all our matrix clients are smart enough to
- # be happy with Cache-Control (right?)
- request.setHeader('Cache-Control', 'public,max-age=86400,s-maxage=86400')
-
+ # XXX: we might want to turn this off for data we don't want to
+ # recommend caching as it's sensitive or private - or at least
+ # select private. don't bother setting Expires as all our matrix
+ # clients are smart enough to be happy with Cache-Control (right?)
+ request.setHeader(
+ "Cache-Control", "public,max-age=86400,s-maxage=86400"
+ )
+
d = FileSender().beginFileTransfer(f, request)
# after the file has been sent, clean up and finish the request
diff --git a/synapse/http/server.py b/synapse/http/server.py
index 03f7768761..8024ff5bde 100644
--- a/synapse/http/server.py
+++ b/synapse/http/server.py
@@ -138,8 +138,7 @@ class JsonResource(HttpServer, resource.Resource):
)
except CodeMessageException as e:
if isinstance(e, SynapseError):
- logger.info("%s SynapseError: %s - %s", request, e.code,
- e.msg)
+ logger.info("%s SynapseError: %s - %s", request, e.code, e.msg)
else:
logger.exception(e)
self._send_response(
diff --git a/synapse/notifier.py b/synapse/notifier.py
index 0c8ca6ec66..5e14950449 100644
--- a/synapse/notifier.py
+++ b/synapse/notifier.py
@@ -214,6 +214,7 @@ class Notifier(object):
timeout,
deferred,
)
+
def _timeout_listener():
# TODO (erikj): We should probably set to_token to the current
# max rather than reusing from_token.
diff --git a/synapse/rest/events.py b/synapse/rest/events.py
index 92ff5e5ca7..3c1b041bfe 100644
--- a/synapse/rest/events.py
+++ b/synapse/rest/events.py
@@ -26,7 +26,6 @@ import logging
logger = logging.getLogger(__name__)
-
class EventStreamRestServlet(RestServlet):
PATTERN = client_path_pattern("/events$")
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py
index 236cfebf64..fd5b2affad 100644
--- a/synapse/storage/_base.py
+++ b/synapse/storage/_base.py
@@ -91,6 +91,7 @@ class SQLBaseStore(object):
def runInteraction(self, desc, func, *args, **kwargs):
"""Wraps the .runInteraction() method on the underlying db_pool."""
current_context = LoggingContext.current_context()
+
def inner_func(txn, *args, **kwargs):
with LoggingContext("runInteraction") as context:
current_context.copy_to(context)
diff --git a/synapse/storage/registration.py b/synapse/storage/registration.py
index 1f89d77344..4d15005c9e 100644
--- a/synapse/storage/registration.py
+++ b/synapse/storage/registration.py
@@ -75,7 +75,9 @@ class RegistrationStore(SQLBaseStore):
"VALUES (?,?,?)",
[user_id, password_hash, now])
except IntegrityError:
- raise StoreError(400, "User ID already taken.", errcode=Codes.USER_IN_USE)
+ raise StoreError(
+ 400, "User ID already taken.", errcode=Codes.USER_IN_USE
+ )
# it's possible for this to get a conflict, but only for a single user
# since tokens are namespaced based on their user ID
@@ -83,8 +85,8 @@ class RegistrationStore(SQLBaseStore):
"VALUES (?,?)", [txn.lastrowid, token])
def get_user_by_id(self, user_id):
- query = ("SELECT users.name, users.password_hash FROM users "
- "WHERE users.name = ?")
+ query = ("SELECT users.name, users.password_hash FROM users"
+ " WHERE users.name = ?")
return self._execute(
self.cursor_to_dict,
query, user_id
@@ -120,10 +122,10 @@ class RegistrationStore(SQLBaseStore):
def _query_for_auth(self, txn, token):
sql = (
- "SELECT users.name, users.admin, access_tokens.device_id "
- "FROM users "
- "INNER JOIN access_tokens on users.id = access_tokens.user_id "
- "WHERE token = ?"
+ "SELECT users.name, users.admin, access_tokens.device_id"
+ " FROM users"
+ " INNER JOIN access_tokens on users.id = access_tokens.user_id"
+ " WHERE token = ?"
)
cursor = txn.execute(sql, (token,))
diff --git a/synapse/storage/room.py b/synapse/storage/room.py
index cc0513b8d2..2378d65943 100644
--- a/synapse/storage/room.py
+++ b/synapse/storage/room.py
@@ -27,7 +27,9 @@ import logging
logger = logging.getLogger(__name__)
-OpsLevel = collections.namedtuple("OpsLevel", ("ban_level", "kick_level", "redact_level"))
+OpsLevel = collections.namedtuple("OpsLevel", (
+ "ban_level", "kick_level", "redact_level")
+)
class RoomStore(SQLBaseStore):
diff --git a/synapse/storage/signatures.py b/synapse/storage/signatures.py
index d90e08fff1..eea4f21065 100644
--- a/synapse/storage/signatures.py
+++ b/synapse/storage/signatures.py
@@ -36,7 +36,7 @@ class SignatureStore(SQLBaseStore):
return dict(txn.fetchall())
def _store_event_content_hash_txn(self, txn, event_id, algorithm,
- hash_bytes):
+ hash_bytes):
"""Store a hash for a Event
Args:
txn (cursor):
@@ -84,7 +84,7 @@ class SignatureStore(SQLBaseStore):
return dict(txn.fetchall())
def _store_event_reference_hash_txn(self, txn, event_id, algorithm,
- hash_bytes):
+ hash_bytes):
"""Store a hash for a PDU
Args:
txn (cursor):
@@ -127,7 +127,7 @@ class SignatureStore(SQLBaseStore):
return res
def _store_event_signature_txn(self, txn, event_id, signature_name, key_id,
- signature_bytes):
+ signature_bytes):
"""Store a signature from the origin server for a PDU.
Args:
txn (cursor):
@@ -169,7 +169,7 @@ class SignatureStore(SQLBaseStore):
return results
def _store_prev_event_hash_txn(self, txn, event_id, prev_event_id,
- algorithm, hash_bytes):
+ algorithm, hash_bytes):
self._simple_insert_txn(
txn,
"event_edge_hashes",
@@ -180,4 +180,4 @@ class SignatureStore(SQLBaseStore):
"hash": buffer(hash_bytes),
},
or_ignore=True,
- )
\ No newline at end of file
+ )
diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py
index a954024678..b84735e61c 100644
--- a/synapse/storage/stream.py
+++ b/synapse/storage/stream.py
@@ -213,8 +213,8 @@ class StreamStore(SQLBaseStore):
# Tokens really represent positions between elements, but we use
# the convention of pointing to the event before the gap. Hence
# we have a bit of asymmetry when it comes to equalities.
- from_comp = '<=' if direction =='b' else '>'
- to_comp = '>' if direction =='b' else '<='
+ from_comp = '<=' if direction == 'b' else '>'
+ to_comp = '>' if direction == 'b' else '<='
order = "DESC" if direction == 'b' else "ASC"
args = [room_id]
@@ -235,9 +235,10 @@ class StreamStore(SQLBaseStore):
)
sql = (
- "SELECT *, (%(redacted)s) AS redacted FROM events "
- "WHERE outlier = 0 AND room_id = ? AND %(bounds)s "
- "ORDER BY topological_ordering %(order)s, stream_ordering %(order)s %(limit)s "
+ "SELECT *, (%(redacted)s) AS redacted FROM events"
+ " WHERE outlier = 0 AND room_id = ? AND %(bounds)s"
+ " ORDER BY topological_ordering %(order)s,"
+ " stream_ordering %(order)s %(limit)s"
) % {
"redacted": del_sql,
"bounds": bounds,
diff --git a/synapse/util/__init__.py b/synapse/util/__init__.py
index e57fb0e914..7ec5033ceb 100644
--- a/synapse/util/__init__.py
+++ b/synapse/util/__init__.py
@@ -37,6 +37,7 @@ class Clock(object):
def call_later(self, delay, callback):
current_context = LoggingContext.current_context()
+
def wrapped_callback():
LoggingContext.thread_local.current_context = current_context
callback()
diff --git a/synapse/util/async.py b/synapse/util/async.py
index 1219d927db..7dd3ec3a72 100644
--- a/synapse/util/async.py
+++ b/synapse/util/async.py
@@ -18,6 +18,7 @@ from twisted.internet import defer, reactor
from .logcontext import PreserveLoggingContext
+
@defer.inlineCallbacks
def sleep(seconds):
d = defer.Deferred()
@@ -25,6 +26,7 @@ def sleep(seconds):
with PreserveLoggingContext():
yield d
+
def run_on_reactor():
""" This will cause the rest of the function to be invoked upon the next
iteration of the main loop
|
