summary refs log tree commit diff
path: root/synapse/push/baserules.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-10 17:34:51 +0000
committerErik Johnston <erik@matrix.org>2015-02-10 17:34:51 +0000
commiteae0842bc17b8af75bcb599866a5df8670fac754 (patch)
treea79e00280a48b6d56eae9c9ce6dee4448b4a119c /synapse/push/baserules.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into state-chache (diff)
parentLog all the exits from _attempt_new_transaction (diff)
downloadsynapse-eae0842bc17b8af75bcb599866a5df8670fac754.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into state-chache
Diffstat (limited to 'synapse/push/baserules.py')
-rw-r--r--synapse/push/baserules.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/synapse/push/baserules.py b/synapse/push/baserules.py

index 37878f1e0b..162d265f66 100644 --- a/synapse/push/baserules.py +++ b/synapse/push/baserules.py
@@ -1,5 +1,6 @@ from synapse.push.rulekinds import PRIORITY_CLASS_MAP, PRIORITY_CLASS_INVERSE_MAP + def list_with_base_rules(rawrules, user_name): ruleslist = [] @@ -9,9 +10,9 @@ def list_with_base_rules(rawrules, user_name): if r['priority_class'] < current_prio_class: while r['priority_class'] < current_prio_class: ruleslist.extend(make_base_rules( - user_name, - PRIORITY_CLASS_INVERSE_MAP[current_prio_class]) - ) + user_name, + PRIORITY_CLASS_INVERSE_MAP[current_prio_class] + )) current_prio_class -= 1 ruleslist.append(r) @@ -19,8 +20,8 @@ def list_with_base_rules(rawrules, user_name): while current_prio_class > 0: ruleslist.extend(make_base_rules( user_name, - PRIORITY_CLASS_INVERSE_MAP[current_prio_class]) - ) + PRIORITY_CLASS_INVERSE_MAP[current_prio_class] + )) current_prio_class -= 1 return ruleslist