diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-03-08 18:11:10 +0000 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2016-03-08 18:11:10 +0000 |
| commit | 5f5817ab05764603f9ca1b74261d9dd42fe55cfb (patch) | |
| tree | df763543528231bf10ce1b7925a55da5ba211820 /synapse/push/action_generator.py | |
| parent | Merge pull request #633 from matrix-org/daniel/ick (diff) | |
| parent | Fix relative imports so they work in both py3 and py27 (diff) | |
| download | synapse-5f5817ab05764603f9ca1b74261d9dd42fe55cfb.tar.xz | |
Merge pull request #632 from matrix-org/markjh/py3v2
Fix relative imports so they work in both py3 and py27
Diffstat (limited to 'synapse/push/action_generator.py')
| -rw-r--r-- | synapse/push/action_generator.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/push/action_generator.py b/synapse/push/action_generator.py index c6c1dc769e..84efcdd184 100644 --- a/synapse/push/action_generator.py +++ b/synapse/push/action_generator.py @@ -15,7 +15,7 @@ from twisted.internet import defer -import bulk_push_rule_evaluator +from .bulk_push_rule_evaluator import evaluator_for_room_id import logging @@ -35,7 +35,7 @@ class ActionGenerator: @defer.inlineCallbacks def handle_push_actions_for_event(self, event, context, handler): - bulk_evaluator = yield bulk_push_rule_evaluator.evaluator_for_room_id( + bulk_evaluator = yield evaluator_for_room_id( event.room_id, self.hs, self.store ) |