Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit 9b5e057

Browse files
committed
Fix some lint
1 parent 800f3a3 commit 9b5e057

File tree

6 files changed

+24
-21
lines changed

6 files changed

+24
-21
lines changed

synapse/events/builder.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,10 @@ def is_state(self):
9898
return self._state_key is not None
9999

100100
async def build(
101-
self, prev_event_ids: List[str], overriding_prev_events: False, auth_event_ids: Optional[List[str]],
101+
self,
102+
prev_event_ids: List[str],
103+
overriding_prev_events: False,
104+
auth_event_ids: Optional[List[str]],
102105
) -> EventBase:
103106
"""Transform into a fully signed and hashed event
104107

synapse/handlers/message.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -815,7 +815,9 @@ async def create_new_client_event(
815815
), "Attempting to create an event with no prev_events"
816816

817817
event = await builder.build(
818-
prev_event_ids=prev_event_ids, overriding_prev_events=overriding_prev_events, auth_event_ids=auth_event_ids
818+
prev_event_ids=prev_event_ids,
819+
overriding_prev_events=overriding_prev_events,
820+
auth_event_ids=auth_event_ids,
819821
)
820822
context = await self.state.compute_event_context(event)
821823
if requester:

synapse/handlers/sync.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,7 @@
4242
from synapse.util.caches.lrucache import LruCache
4343
from synapse.util.caches.response_cache import ResponseCache
4444
from synapse.util.metrics import Measure, measure_func
45-
from synapse.visibility import (
46-
filter_events_for_client,
47-
filter_historical_events
48-
)
45+
from synapse.visibility import filter_events_for_client, filter_historical_events
4946

5047
if TYPE_CHECKING:
5148
from synapse.server import HomeServer

synapse/http/servlet.py

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -148,19 +148,12 @@ def parse_string(
148148
)
149149

150150

151-
def parse_string_value(
152-
value,
153-
allowed_values,
154-
name="",
155-
encoding="ascii"
156-
) -> str:
151+
def parse_string_value(value, allowed_values, name="", encoding="ascii") -> str:
157152
if encoding:
158153
try:
159154
value = value.decode(encoding)
160155
except ValueError:
161-
raise SynapseError(
162-
400, "Query parameter %r must be %s" % (name, encoding)
163-
)
156+
raise SynapseError(400, "Query parameter %r must be %s" % (name, encoding))
164157

165158
if allowed_values is not None and value not in allowed_values:
166159
message = "Query parameter %r must be one of [%s]" % (
@@ -171,6 +164,7 @@ def parse_string_value(
171164
else:
172165
return value
173166

167+
174168
def parse_strings_from_args(
175169
args,
176170
name,
@@ -187,7 +181,10 @@ def parse_strings_from_args(
187181
if name in args:
188182
values = args[name]
189183

190-
return [parse_string_value(value, allowed_values, name=name, encoding=encoding) for value in values]
184+
return [
185+
parse_string_value(value, allowed_values, name=name, encoding=encoding)
186+
for value in values
187+
]
191188
else:
192189
if required:
193190
message = "Missing %s query parameter %r" % (param_type, name)
@@ -218,13 +215,14 @@ def parse_string_from_args(
218215
param_type=param_type,
219216
encoding=encoding,
220217
)
221-
218+
222219
if isinstance(strings, list) and len(strings):
223220
return strings[0]
224221

225222
# Return the default
226223
return strings
227224

225+
228226
def parse_json_value_from_request(request, allow_empty_body=False):
229227
"""Parse a JSON value from the body of a twisted HTTP request.
230228
@@ -279,6 +277,7 @@ def parse_json_object_from_request(request, allow_empty_body=False):
279277

280278
return content
281279

280+
282281
def assert_params_in_dict(body, required):
283282
absent = []
284283
for k in required:

synapse/rest/client/v1/room.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,12 +230,14 @@ async def on_POST(self, request, room_id, event_type, txn_id=None):
230230
"type": event_type,
231231
"content": content,
232232
"room_id": room_id,
233-
"sender": requester.user.to_string()
233+
"sender": requester.user.to_string(),
234234
}
235235

236236
if prev_events:
237237
event_dict["prev_events"] = prev_events
238238

239+
# TODO: Put app_service logic back in place once we figure out how to make the Complement tests
240+
# run as an app service
239241
if b"ts" in request.args: # and requester.app_service:
240242
event_dict["origin_server_ts"] = parse_integer(request, "ts", 0)
241243

synapse/visibility.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,8 @@
4545
Membership.BAN,
4646
)
4747

48-
async def filter_historical_events(
49-
events
50-
):
48+
49+
async def filter_historical_events(events):
5150
filtered_events = [e for e in events if not e.content.get("m.historical", None)]
5251

5352
# remove the None entries
@@ -56,6 +55,7 @@ async def filter_historical_events(
5655
# we turn it into a list before returning it.
5756
return list(filtered_events)
5857

58+
5959
async def filter_events_for_client(
6060
storage: Storage,
6161
user_id,

0 commit comments

Comments
 (0)