mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-10-11 19:50:37 -04:00
Update black, and run auto formatting over the codebase (#9381)
- Update black version to the latest
- Run black auto formatting over the codebase
- Run autoformatting according to [`docs/code_style.md
`](80d6dc9783/docs/code_style.md
)
- Update `code_style.md` docs around installing black to use the correct version
This commit is contained in:
parent
5636e597c3
commit
0a00b7ff14
271 changed files with 2802 additions and 1713 deletions
|
@ -398,7 +398,7 @@ class StateHandler:
|
|||
async def resolve_state_groups_for_events(
|
||||
self, room_id: str, event_ids: Iterable[str]
|
||||
) -> _StateCacheEntry:
|
||||
""" Given a list of event_ids this method fetches the state at each
|
||||
"""Given a list of event_ids this method fetches the state at each
|
||||
event, resolves conflicts between them and returns them.
|
||||
|
||||
Args:
|
||||
|
@ -570,7 +570,9 @@ class StateResolutionHandler:
|
|||
return cache
|
||||
|
||||
logger.info(
|
||||
"Resolving state for %s with groups %s", room_id, list(group_names),
|
||||
"Resolving state for %s with groups %s",
|
||||
room_id,
|
||||
list(group_names),
|
||||
)
|
||||
|
||||
state_groups_histogram.observe(len(state_groups_ids))
|
||||
|
@ -656,11 +658,15 @@ class StateResolutionHandler:
|
|||
return
|
||||
|
||||
self._report_biggest(
|
||||
lambda i: i.cpu_time, "CPU time", _biggest_room_by_cpu_counter,
|
||||
lambda i: i.cpu_time,
|
||||
"CPU time",
|
||||
_biggest_room_by_cpu_counter,
|
||||
)
|
||||
|
||||
self._report_biggest(
|
||||
lambda i: i.db_time, "DB time", _biggest_room_by_db_counter,
|
||||
lambda i: i.db_time,
|
||||
"DB time",
|
||||
_biggest_room_by_db_counter,
|
||||
)
|
||||
|
||||
self._state_res_metrics.clear()
|
||||
|
|
|
@ -95,7 +95,11 @@ async def resolve_events_with_store(
|
|||
if event.room_id != room_id:
|
||||
raise Exception(
|
||||
"Attempting to state-resolve for room %s with event %s which is in %s"
|
||||
% (room_id, event.event_id, event.room_id,)
|
||||
% (
|
||||
room_id,
|
||||
event.event_id,
|
||||
event.room_id,
|
||||
)
|
||||
)
|
||||
|
||||
# get the ids of the auth events which allow us to authenticate the
|
||||
|
@ -119,7 +123,11 @@ async def resolve_events_with_store(
|
|||
if event.room_id != room_id:
|
||||
raise Exception(
|
||||
"Attempting to state-resolve for room %s with event %s which is in %s"
|
||||
% (room_id, event.event_id, event.room_id,)
|
||||
% (
|
||||
room_id,
|
||||
event.event_id,
|
||||
event.room_id,
|
||||
)
|
||||
)
|
||||
|
||||
state_map.update(state_map_new)
|
||||
|
@ -243,7 +251,7 @@ def _resolve_with_state(
|
|||
def _resolve_state_events(
|
||||
conflicted_state: StateMap[List[EventBase]], auth_events: MutableStateMap[EventBase]
|
||||
) -> StateMap[EventBase]:
|
||||
""" This is where we actually decide which of the conflicted state to
|
||||
"""This is where we actually decide which of the conflicted state to
|
||||
use.
|
||||
|
||||
We resolve conflicts in the following order:
|
||||
|
|
|
@ -118,7 +118,11 @@ async def resolve_events_with_store(
|
|||
if event.room_id != room_id:
|
||||
raise Exception(
|
||||
"Attempting to state-resolve for room %s with event %s which is in %s"
|
||||
% (room_id, event.event_id, event.room_id,)
|
||||
% (
|
||||
room_id,
|
||||
event.event_id,
|
||||
event.room_id,
|
||||
)
|
||||
)
|
||||
|
||||
full_conflicted_set = {eid for eid in full_conflicted_set if eid in event_map}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue