pep8 & unused variable

This commit is contained in:
David Baker 2015-12-22 17:25:09 +00:00
parent 140a50f641
commit 9b4cd0cd0f
3 changed files with 3 additions and 4 deletions

View File

@ -26,6 +26,7 @@ import random
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
# Pushers could now be moved to pull out of the event_actions table instead # Pushers could now be moved to pull out of the event_actions table instead
# of listening on the event stream: this would avoid them having to run the # of listening on the event stream: this would avoid them having to run the
# rules again. # rules again.

View File

@ -35,8 +35,6 @@ class ActionGenerator:
@defer.inlineCallbacks @defer.inlineCallbacks
def handle_event(self, event): def handle_event(self, event):
users = yield self.store.get_users_in_room(event['room_id'])
bulk_evaluator = yield bulk_push_rule_evaluator.evaluator_for_room_id( bulk_evaluator = yield bulk_push_rule_evaluator.evaluator_for_room_id(
event['room_id'], self.hs, self.store event['room_id'], self.hs, self.store
) )

View File

@ -54,7 +54,7 @@ def evaluator_for_room_id(room_id, hs, store):
display_names[ev.state_key] = ev.content.get("displayname") display_names[ev.state_key] = ev.content.get("displayname")
defer.returnValue(BulkPushRuleEvaluator( defer.returnValue(BulkPushRuleEvaluator(
room_id, rules_by_user, display_names, users room_id, rules_by_user, display_names, users
)) ))
@ -104,4 +104,4 @@ class BulkPushRuleEvaluator:
matches &= PushRuleEvaluator._event_fulfills_condition( matches &= PushRuleEvaluator._event_fulfills_condition(
event, cond, display_name, room_member_count, profile_tag event, cond, display_name, room_member_count, profile_tag
) )
return matches return matches