Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more pep8

This commit is contained in:
David Baker 2015-01-23 13:28:00 +00:00
parent d3e72b4d87
commit b3f66ea6fb
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/rest/client/v1/push_rule.py
View File

@ -249,7 +249,6 @@ class PushRuleRestServlet(RestServlet):
else:
raise UnrecognizedRequestError()
def on_OPTIONS(self, _):
return 200, {}
@ -259,6 +258,7 @@ def _add_empty_priority_class_arrays(d):
d[pc] = []
return d
def _instance_handle_from_conditions(conditions):
"""
Given a list of conditions, return the instance handle of the
@ -289,6 +289,7 @@ def _filter_ruleset_with_path(ruleset, path):
return r
raise NotFoundError
def _priority_class_to_template_name(pc):
if pc > PushRuleRestServlet.PRIORITY_CLASS_MAP['override']:
# per-device
@ -297,12 +298,13 @@ def _priority_class_to_template_name(pc):
else:
return PushRuleRestServlet.PRIORITY_CLASS_INVERSE_MAP[pc]
def _rule_to_template(rule):
template_name = _priority_class_to_template_name(rule['priority_class'])
if template_name in ['override', 'underride']:
return {k:rule[k] for k in ["rule_id", "conditions", "actions"]}
elif template_name in ["sender", "room"]:
return {k:rule[k] for k in ["rule_id", "actions"]}
return {k: rule[k] for k in ["rule_id", "actions"]}
elif template_name == 'content':
if len(rule["conditions"]) != 1:
return None