diff --git a/synapse/handlers/events.py b/synapse/handlers/events.py
index b336b292d3..e08231406d 100644
--- a/synapse/handlers/events.py
+++ b/synapse/handlers/events.py
@@ -59,7 +59,6 @@ class EventStreamHandler(BaseHandler):
)
self._streams_per_user[auth_user] += 1
-
if pagin_config.from_token is None:
pagin_config.from_token = None
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 19ade10a91..bf66d74548 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -311,12 +311,18 @@ class MessageHandler(BaseHandler):
"end": token[1],
}
- current_state = yield self.store.get_current_state(event.room_id)
+ current_state = yield self.store.get_current_state(
+ event.room_id
+ )
d["state"] = [c.get_dict() for c in current_state]
except:
logger.exception("Failed to get snapshot")
- ret = {"rooms": rooms_ret, "presence": presence, "end": now_token.to_string()}
+ ret = {
+ "rooms": rooms_ret,
+ "presence": presence,
+ "end": now_token.to_string()
+ }
defer.returnValue(ret)
@@ -499,7 +505,7 @@ class RoomMemberHandler(BaseHandler):
for entry in member_list
]
chunk_data = {
- "start": "START", # FIXME (erikj): START is no longer a valid value
+ "start": "START", # FIXME (erikj): START is no longer valid
"end": "END",
"chunk": event_list
}
diff --git a/synapse/streams/config.py b/synapse/streams/config.py
index b6ffbab1e7..69c7145a36 100644
--- a/synapse/streams/config.py
+++ b/synapse/streams/config.py
@@ -27,7 +27,9 @@ class PaginationConfig(object):
"""A configuration object which stores pagination parameters."""
def __init__(self, from_tok=None, to_tok=None, direction='f', limit=0):
- self.from_token = StreamToken.from_string(from_tok) if from_tok else None
+ self.from_token = (
+ StreamToken.from_string(from_tok) if from_tok else None
+ )
self.to_token = StreamToken.from_string(to_tok) if to_tok else None
self.direction = 'f' if direction == 'f' else 'b'
self.limit = int(limit)
@@ -67,6 +69,3 @@ class PaginationConfig(object):
"<PaginationConfig from_tok=%s, to_tok=%s, "
"direction=%s, limit=%s>"
) % (self.from_tok, self.to_tok, self.direction, self.limit)
-
-
-
diff --git a/synapse/streams/events.py b/synapse/streams/events.py
index 36174a811b..bf48df5b79 100644
--- a/synapse/streams/events.py
+++ b/synapse/streams/events.py
@@ -171,4 +171,3 @@ class StreamSource(object):
class PaginationSource(object):
def get_pagination_rows(self, user, from_token, to_token, limit, key):
raise NotImplementedError("get_rows")
-
diff --git a/synapse/types.py b/synapse/types.py
index c8936b5758..63154855dd 100644
--- a/synapse/types.py
+++ b/synapse/types.py
@@ -121,7 +121,6 @@ class StreamToken(
str(self.presence_key),
])
-
def copy_and_replace(self, key, new_value):
d = self._asdict()
d[key] = new_value
|
