mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-12-10 10:42:31 -05:00
Replace returnValue with return (#5736)
This commit is contained in:
Amber Brown
GitHub
parent
18a466b84e
commit
4806651744
177 changed files with 1359 additions and 1513 deletions
|
|
@ -135,7 +135,7 @@ class StateHandler(object):
|
|||
event = None
|
||||
if event_id:
|
||||
event = yield self.store.get_event(event_id, allow_none=True)
|
||||
defer.returnValue(event)
|
||||
return event
|
||||
return
|
||||
|
||||
state_map = yield self.store.get_events(
|
||||
|
|
@ -145,7 +145,7 @@ class StateHandler(object):
|
|||
key: state_map[e_id] for key, e_id in iteritems(state) if e_id in state_map
|
||||
}
|
||||
|
||||
defer.returnValue(state)
|
||||
return state
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def get_current_state_ids(self, room_id, latest_event_ids=None):
|
||||
|
|
@ -169,7 +169,7 @@ class StateHandler(object):
|
|||
ret = yield self.resolve_state_groups_for_events(room_id, latest_event_ids)
|
||||
state = ret.state
|
||||
|
||||
defer.returnValue(state)
|
||||
return state
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def get_current_users_in_room(self, room_id, latest_event_ids=None):
|
||||
|
|
@ -189,7 +189,7 @@ class StateHandler(object):
|
|||
logger.debug("calling resolve_state_groups from get_current_users_in_room")
|
||||
entry = yield self.resolve_state_groups_for_events(room_id, latest_event_ids)
|
||||
joined_users = yield self.store.get_joined_users_from_state(room_id, entry)
|
||||
defer.returnValue(joined_users)
|
||||
return joined_users
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def get_current_hosts_in_room(self, room_id, latest_event_ids=None):
|
||||
|
|
@ -198,7 +198,7 @@ class StateHandler(object):
|
|||
logger.debug("calling resolve_state_groups from get_current_hosts_in_room")
|
||||
entry = yield self.resolve_state_groups_for_events(room_id, latest_event_ids)
|
||||
joined_hosts = yield self.store.get_joined_hosts(room_id, entry)
|
||||
defer.returnValue(joined_hosts)
|
||||
return joined_hosts
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def compute_event_context(self, event, old_state=None):
|
||||
|
|
@ -241,7 +241,7 @@ class StateHandler(object):
|
|||
prev_state_ids=prev_state_ids,
|
||||
)
|
||||
|
||||
defer.returnValue(context)
|
||||
return context
|
||||
|
||||
if old_state:
|
||||
# We already have the state, so we don't need to calculate it.
|
||||
|
|
@ -275,7 +275,7 @@ class StateHandler(object):
|
|||
prev_state_ids=prev_state_ids,
|
||||
)
|
||||
|
||||
defer.returnValue(context)
|
||||
return context
|
||||
|
||||
logger.debug("calling resolve_state_groups from compute_event_context")
|
||||
|
||||
|
|
@ -343,7 +343,7 @@ class StateHandler(object):
|
|||
delta_ids=delta_ids,
|
||||
)
|
||||
|
||||
defer.returnValue(context)
|
||||
return context
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def resolve_state_groups_for_events(self, room_id, event_ids):
|
||||
|
|
@ -368,19 +368,17 @@ class StateHandler(object):
|
|||
state_groups_ids = yield self.store.get_state_groups_ids(room_id, event_ids)
|
||||
|
||||
if len(state_groups_ids) == 0:
|
||||
defer.returnValue(_StateCacheEntry(state={}, state_group=None))
|
||||
return _StateCacheEntry(state={}, state_group=None)
|
||||
elif len(state_groups_ids) == 1:
|
||||
name, state_list = list(state_groups_ids.items()).pop()
|
||||
|
||||
prev_group, delta_ids = yield self.store.get_state_group_delta(name)
|
||||
|
||||
defer.returnValue(
|
||||
_StateCacheEntry(
|
||||
state=state_list,
|
||||
state_group=name,
|
||||
prev_group=prev_group,
|
||||
delta_ids=delta_ids,
|
||||
)
|
||||
return _StateCacheEntry(
|
||||
state=state_list,
|
||||
state_group=name,
|
||||
prev_group=prev_group,
|
||||
delta_ids=delta_ids,
|
||||
)
|
||||
|
||||
room_version = yield self.store.get_room_version(room_id)
|
||||
|
|
@ -392,7 +390,7 @@ class StateHandler(object):
|
|||
None,
|
||||
state_res_store=StateResolutionStore(self.store),
|
||||
)
|
||||
defer.returnValue(result)
|
||||
return result
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def resolve_events(self, room_version, state_sets, event):
|
||||
|
|
@ -415,7 +413,7 @@ class StateHandler(object):
|
|||
|
||||
new_state = {key: state_map[ev_id] for key, ev_id in iteritems(new_state)}
|
||||
|
||||
defer.returnValue(new_state)
|
||||
return new_state
|
||||
|
||||
|
||||
class StateResolutionHandler(object):
|
||||
|
|
@ -479,7 +477,7 @@ class StateResolutionHandler(object):
|
|||
if self._state_cache is not None:
|
||||
cache = self._state_cache.get(group_names, None)
|
||||
if cache:
|
||||
defer.returnValue(cache)
|
||||
return cache
|
||||
|
||||
logger.info(
|
||||
"Resolving state for %s with %d groups", room_id, len(state_groups_ids)
|
||||
|
|
@ -525,7 +523,7 @@ class StateResolutionHandler(object):
|
|||
if self._state_cache is not None:
|
||||
self._state_cache[group_names] = cache
|
||||
|
||||
defer.returnValue(cache)
|
||||
return cache
|
||||
|
||||
|
||||
def _make_state_cache_entry(new_state, state_groups_ids):
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ def resolve_events_with_store(state_sets, event_map, state_map_factory):
|
|||
a map from (type, state_key) to event_id.
|
||||
"""
|
||||
if len(state_sets) == 1:
|
||||
defer.returnValue(state_sets[0])
|
||||
return state_sets[0]
|
||||
|
||||
unconflicted_state, conflicted_state = _seperate(state_sets)
|
||||
|
||||
|
|
@ -97,10 +97,8 @@ def resolve_events_with_store(state_sets, event_map, state_map_factory):
|
|||
state_map_new = yield state_map_factory(new_needed_events)
|
||||
state_map.update(state_map_new)
|
||||
|
||||
defer.returnValue(
|
||||
_resolve_with_state(
|
||||
unconflicted_state, conflicted_state, auth_events, state_map
|
||||
)
|
||||
return _resolve_with_state(
|
||||
unconflicted_state, conflicted_state, auth_events, state_map
|
||||
)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ def resolve_events_with_store(room_version, state_sets, event_map, state_res_sto
|
|||
unconflicted_state, conflicted_state = _seperate(state_sets)
|
||||
|
||||
if not conflicted_state:
|
||||
defer.returnValue(unconflicted_state)
|
||||
return unconflicted_state
|
||||
|
||||
logger.debug("%d conflicted state entries", len(conflicted_state))
|
||||
logger.debug("Calculating auth chain difference")
|
||||
|
|
@ -137,7 +137,7 @@ def resolve_events_with_store(room_version, state_sets, event_map, state_res_sto
|
|||
|
||||
logger.debug("done")
|
||||
|
||||
defer.returnValue(resolved_state)
|
||||
return resolved_state
|
||||
|
||||
|
||||
@defer.inlineCallbacks
|
||||
|
|
@ -168,18 +168,18 @@ def _get_power_level_for_sender(event_id, event_map, state_res_store):
|
|||
aev = yield _get_event(aid, event_map, state_res_store)
|
||||
if (aev.type, aev.state_key) == (EventTypes.Create, ""):
|
||||
if aev.content.get("creator") == event.sender:
|
||||
defer.returnValue(100)
|
||||
return 100
|
||||
break
|
||||
defer.returnValue(0)
|
||||
return 0
|
||||
|
||||
level = pl.content.get("users", {}).get(event.sender)
|
||||
if level is None:
|
||||
level = pl.content.get("users_default", 0)
|
||||
|
||||
if level is None:
|
||||
defer.returnValue(0)
|
||||
return 0
|
||||
else:
|
||||
defer.returnValue(int(level))
|
||||
return int(level)
|
||||
|
||||
|
||||
@defer.inlineCallbacks
|
||||
|
|
@ -224,7 +224,7 @@ def _get_auth_chain_difference(state_sets, event_map, state_res_store):
|
|||
intersection = set(auth_sets[0]).intersection(*auth_sets[1:])
|
||||
union = set().union(*auth_sets)
|
||||
|
||||
defer.returnValue(union - intersection)
|
||||
return union - intersection
|
||||
|
||||
|
||||
def _seperate(state_sets):
|
||||
|
|
@ -343,7 +343,7 @@ def _reverse_topological_power_sort(event_ids, event_map, state_res_store, auth_
|
|||
it = lexicographical_topological_sort(graph, key=_get_power_order)
|
||||
sorted_events = list(it)
|
||||
|
||||
defer.returnValue(sorted_events)
|
||||
return sorted_events
|
||||
|
||||
|
||||
@defer.inlineCallbacks
|
||||
|
|
@ -396,7 +396,7 @@ def _iterative_auth_checks(
|
|||
except AuthError:
|
||||
pass
|
||||
|
||||
defer.returnValue(resolved_state)
|
||||
return resolved_state
|
||||
|
||||
|
||||
@defer.inlineCallbacks
|
||||
|
|
@ -439,7 +439,7 @@ def _mainline_sort(event_ids, resolved_power_event_id, event_map, state_res_stor
|
|||
|
||||
event_ids.sort(key=lambda ev_id: order_map[ev_id])
|
||||
|
||||
defer.returnValue(event_ids)
|
||||
return event_ids
|
||||
|
||||
|
||||
@defer.inlineCallbacks
|
||||
|
|
@ -462,7 +462,7 @@ def _get_mainline_depth_for_event(event, mainline_map, event_map, state_res_stor
|
|||
while event:
|
||||
depth = mainline_map.get(event.event_id)
|
||||
if depth is not None:
|
||||
defer.returnValue(depth)
|
||||
return depth
|
||||
|
||||
auth_events = event.auth_event_ids()
|
||||
event = None
|
||||
|
|
@ -474,7 +474,7 @@ def _get_mainline_depth_for_event(event, mainline_map, event_map, state_res_stor
|
|||
break
|
||||
|
||||
# Didn't find a power level auth event, so we just return 0
|
||||
defer.returnValue(0)
|
||||
return 0
|
||||
|
||||
|
||||
@defer.inlineCallbacks
|
||||
|
|
@ -493,7 +493,7 @@ def _get_event(event_id, event_map, state_res_store):
|
|||
if event_id not in event_map:
|
||||
events = yield state_res_store.get_events([event_id], allow_rejected=True)
|
||||
event_map.update(events)
|
||||
defer.returnValue(event_map[event_id])
|
||||
return event_map[event_id]
|
||||
|
||||
|
||||
def lexicographical_topological_sort(graph, key):
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue