diff --git a/contrib/experiments/cursesio.py b/contrib/experiments/cursesio.py
index 44afe81008..ffefe3bb39 100644
--- a/contrib/experiments/cursesio.py
+++ b/contrib/experiments/cursesio.py
@@ -19,13 +19,13 @@ from curses.ascii import isprint
from twisted.internet import reactor
-class CursesStdIO():
+class CursesStdIO:
def __init__(self, stdscr, callback=None):
self.statusText = "Synapse test app -"
- self.searchText = ''
+ self.searchText = ""
self.stdscr = stdscr
- self.logLine = ''
+ self.logLine = ""
self.callback = callback
@@ -71,8 +71,7 @@ class CursesStdIO():
i = 0
index = len(self.lines) - 1
while i < (self.rows - 3) and index >= 0:
- self.stdscr.addstr(self.rows - 3 - i, 0, self.lines[index],
- curses.A_NORMAL)
+ self.stdscr.addstr(self.rows - 3 - i, 0, self.lines[index], curses.A_NORMAL)
i = i + 1
index = index - 1
@@ -85,15 +84,13 @@ class CursesStdIO():
raise RuntimeError("TextTooLongError")
self.stdscr.addstr(
- self.rows - 2, 0,
- text + ' ' * (self.cols - len(text)),
- curses.A_STANDOUT)
+ self.rows - 2, 0, text + " " * (self.cols - len(text)), curses.A_STANDOUT
+ )
def printLogLine(self, text):
self.stdscr.addstr(
- 0, 0,
- text + ' ' * (self.cols - len(text)),
- curses.A_STANDOUT)
+ 0, 0, text + " " * (self.cols - len(text)), curses.A_STANDOUT
+ )
def doRead(self):
""" Input is ready! """
@@ -105,7 +102,7 @@ class CursesStdIO():
elif c == curses.KEY_ENTER or c == 10:
text = self.searchText
- self.searchText = ''
+ self.searchText = ""
self.print_line(">> %s" % text)
@@ -122,11 +119,13 @@ class CursesStdIO():
return
self.searchText = self.searchText + chr(c)
- self.stdscr.addstr(self.rows - 1, 0,
- self.searchText + (' ' * (
- self.cols - len(self.searchText) - 2)))
+ self.stdscr.addstr(
+ self.rows - 1,
+ 0,
+ self.searchText + (" " * (self.cols - len(self.searchText) - 2)),
+ )
- self.paintStatus(self.statusText + ' %d' % len(self.searchText))
+ self.paintStatus(self.statusText + " %d" % len(self.searchText))
self.stdscr.move(self.rows - 1, len(self.searchText))
self.stdscr.refresh()
@@ -143,7 +142,6 @@ class CursesStdIO():
class Callback(object):
-
def __init__(self, stdio):
self.stdio = stdio
@@ -152,7 +150,7 @@ class Callback(object):
def main(stdscr):
- screen = CursesStdIO(stdscr) # create Screen object
+ screen = CursesStdIO(stdscr) # create Screen object
callback = Callback(screen)
@@ -164,5 +162,5 @@ def main(stdscr):
screen.close()
-if __name__ == '__main__':
+if __name__ == "__main__":
curses.wrapper(main)
diff --git a/contrib/experiments/test_messaging.py b/contrib/experiments/test_messaging.py
index 85c9c11984..c7e55d8aa7 100644
--- a/contrib/experiments/test_messaging.py
+++ b/contrib/experiments/test_messaging.py
@@ -28,9 +28,7 @@ Currently assumes the local address is localhost:<port>
"""
-from synapse.federation import (
- ReplicationHandler
-)
+from synapse.federation import ReplicationHandler
from synapse.federation.units import Pdu
@@ -38,7 +36,7 @@ from synapse.util import origin_from_ucid
from synapse.app.homeserver import SynapseHomeServer
-#from synapse.util.logutils import log_function
+# from synapse.util.logutils import log_function
from twisted.internet import reactor, defer
from twisted.python import log
@@ -83,7 +81,7 @@ class InputOutput(object):
room_name, = m.groups()
self.print_line("%s joining %s" % (self.user, room_name))
self.server.join_room(room_name, self.user, self.user)
- #self.print_line("OK.")
+ # self.print_line("OK.")
return
m = re.match("^invite (\S+) (\S+)$", line)
@@ -92,7 +90,7 @@ class InputOutput(object):
room_name, invitee = m.groups()
self.print_line("%s invited to %s" % (invitee, room_name))
self.server.invite_to_room(room_name, self.user, invitee)
- #self.print_line("OK.")
+ # self.print_line("OK.")
return
m = re.match("^send (\S+) (.*)$", line)
@@ -101,7 +99,7 @@ class InputOutput(object):
room_name, body = m.groups()
self.print_line("%s send to %s" % (self.user, room_name))
self.server.send_message(room_name, self.user, body)
- #self.print_line("OK.")
+ # self.print_line("OK.")
return
m = re.match("^backfill (\S+)$", line)
@@ -125,7 +123,6 @@ class InputOutput(object):
class IOLoggerHandler(logging.Handler):
-
def __init__(self, io):
logging.Handler.__init__(self)
self.io = io
@@ -142,6 +139,7 @@ class Room(object):
""" Used to store (in memory) the current membership state of a room, and
which home servers we should send PDUs associated with the room to.
"""
+
def __init__(self, room_name):
self.room_name = room_name
self.invited = set()
@@ -175,6 +173,7 @@ class HomeServer(ReplicationHandler):
""" A very basic home server implentation that allows people to join a
room and then invite other people.
"""
+
def __init__(self, server_name, replication_layer, output):
self.server_name = server_name
self.replication_layer = replication_layer
@@ -197,26 +196,27 @@ class HomeServer(ReplicationHandler):
elif pdu.content["membership"] == "invite":
self._on_invite(pdu.origin, pdu.context, pdu.state_key)
else:
- self.output.print_line("#%s (unrec) %s = %s" %
- (pdu.context, pdu.pdu_type, json.dumps(pdu.content))
+ self.output.print_line(
+ "#%s (unrec) %s = %s"
+ % (pdu.context, pdu.pdu_type, json.dumps(pdu.content))
)
- #def on_state_change(self, pdu):
- ##self.output.print_line("#%s (state) %s *** %s" %
- ##(pdu.context, pdu.state_key, pdu.pdu_type)
- ##)
+ # def on_state_change(self, pdu):
+ ##self.output.print_line("#%s (state) %s *** %s" %
+ ##(pdu.context, pdu.state_key, pdu.pdu_type)
+ ##)
- #if "joinee" in pdu.content:
- #self._on_join(pdu.context, pdu.content["joinee"])
- #elif "invitee" in pdu.content:
- #self._on_invite(pdu.origin, pdu.context, pdu.content["invitee"])
+ # if "joinee" in pdu.content:
+ # self._on_join(pdu.context, pdu.content["joinee"])
+ # elif "invitee" in pdu.content:
+ # self._on_invite(pdu.origin, pdu.context, pdu.content["invitee"])
def _on_message(self, pdu):
""" We received a message
"""
- self.output.print_line("#%s %s %s" %
- (pdu.context, pdu.content["sender"], pdu.content["body"])
- )
+ self.output.print_line(
+ "#%s %s %s" % (pdu.context, pdu.content["sender"], pdu.content["body"])
+ )
def _on_join(self, context, joinee):
""" Someone has joined a room, either a remote user or a local user
@@ -224,9 +224,7 @@ class HomeServer(ReplicationHandler):
room = self._get_or_create_room(context)
room.add_participant(joinee)
- self.output.print_line("#%s %s %s" %
- (context, joinee, "*** JOINED")
- )
+ self.output.print_line("#%s %s %s" % (context, joinee, "*** JOINED"))
def _on_invite(self, origin, context, invitee):
""" Someone has been invited
@@ -234,9 +232,7 @@ class HomeServer(ReplicationHandler):
room = self._get_or_create_room(context)
room.add_invited(invitee)
- self.output.print_line("#%s %s %s" %
- (context, invitee, "*** INVITED")
- )
+ self.output.print_line("#%s %s %s" % (context, invitee, "*** INVITED"))
if not room.have_got_metadata and origin is not self.server_name:
logger.debug("Get room state")
@@ -272,14 +268,14 @@ class HomeServer(ReplicationHandler):
try:
pdu = Pdu.create_new(
- context=room_name,
- pdu_type="sy.room.member",
- is_state=True,
- state_key=joinee,
- content={"membership": "join"},
- origin=self.server_name,
- destinations=destinations,
- )
+ context=room_name,
+ pdu_type="sy.room.member",
+ is_state=True,
+ state_key=joinee,
+ content={"membership": "join"},
+ origin=self.server_name,
+ destinations=destinations,
+ )
yield self.replication_layer.send_pdu(pdu)
except Exception as e:
logger.exception(e)
@@ -318,21 +314,21 @@ class HomeServer(ReplicationHandler):
return self.replication_layer.backfill(dest, room_name, limit)
def _get_room_remote_servers(self, room_name):
- return [i for i in self.joined_rooms.setdefault(room_name,).servers]
+ return [i for i in self.joined_rooms.setdefault(room_name).servers]
def _get_or_create_room(self, room_name):
return self.joined_rooms.setdefault(room_name, Room(room_name))
def get_servers_for_context(self, context):
return defer.succeed(
- self.joined_rooms.setdefault(context, Room(context)).servers
- )
+ self.joined_rooms.setdefault(context, Room(context)).servers
+ )
def main(stdscr):
parser = argparse.ArgumentParser()
- parser.add_argument('user', type=str)
- parser.add_argument('-v', '--verbose', action='count')
+ parser.add_argument("user", type=str)
+ parser.add_argument("-v", "--verbose", action="count")
args = parser.parse_args()
user = args.user
@@ -342,8 +338,9 @@ def main(stdscr):
root_logger = logging.getLogger()
- formatter = logging.Formatter('%(asctime)s - %(name)s - %(lineno)d - '
- '%(levelname)s - %(message)s')
+ formatter = logging.Formatter(
+ "%(asctime)s - %(name)s - %(lineno)d - " "%(levelname)s - %(message)s"
+ )
if not os.path.exists("logs"):
os.makedirs("logs")
fh = logging.FileHandler("logs/%s" % user)
|
