diff options
author | Mark Haines <mark.haines@matrix.org> | 2016-03-08 11:45:50 +0000 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2016-03-08 11:45:50 +0000 |
commit | 7076082ae677b280c5b68df37b1fee2fc72752ff (patch) | |
tree | b7e1321f25c661033af27080404247b68f841bfb /synapse/push/push_rule_evaluator.py | |
parent | Merge pull request #631 from matrix-org/markjh/py3v1 (diff) | |
download | synapse-7076082ae677b280c5b68df37b1fee2fc72752ff.tar.xz |
Fix relative imports so they work in both py3 and py27
Diffstat (limited to 'synapse/push/push_rule_evaluator.py')
-rw-r--r-- | synapse/push/push_rule_evaluator.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/push/push_rule_evaluator.py b/synapse/push/push_rule_evaluator.py index 98e2a2015e..51f73a5b78 100644 --- a/synapse/push/push_rule_evaluator.py +++ b/synapse/push/push_rule_evaluator.py @@ -15,7 +15,7 @@ from twisted.internet import defer -import baserules +from .baserules import list_with_base_rules import logging import simplejson as json @@ -91,7 +91,7 @@ class PushRuleEvaluator: rule['actions'] = json.loads(raw_rule['actions']) rules.append(rule) - self.rules = baserules.list_with_base_rules(rules) + self.rules = list_with_base_rules(rules) self.enabled_map = enabled_map |