diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-07-12 09:56:28 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-07-12 09:56:28 +0100 |
| commit | 482d17b58b55e4a62c1b4df9484d1c3af80d94ff (patch) | |
| tree | d936edf00491834d76c7c7aa651d2f884e0c307b /synapse/rest/client/v1/push_rule.py | |
| parent | Enforce the specified API for report_event (diff) | |
| parent | Merge pull request #3505 from matrix-org/erikj/receipts_cahce (diff) | |
| download | synapse-482d17b58b55e4a62c1b4df9484d1c3af80d94ff.tar.xz | |
Merge branch 'develop' into rav/enforce_report_api
Diffstat (limited to 'synapse/rest/client/v1/push_rule.py')
| -rw-r--r-- | synapse/rest/client/v1/push_rule.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/synapse/rest/client/v1/push_rule.py b/synapse/rest/client/v1/push_rule.py index 6bb4821ec6..0df7ce570f 100644 --- a/synapse/rest/client/v1/push_rule.py +++ b/synapse/rest/client/v1/push_rule.py @@ -16,16 +16,18 @@ from twisted.internet import defer from synapse.api.errors import ( - SynapseError, UnrecognizedRequestError, NotFoundError, StoreError + NotFoundError, + StoreError, + SynapseError, + UnrecognizedRequestError, ) -from .base import ClientV1RestServlet, client_path_patterns -from synapse.storage.push_rule import ( - InconsistentRuleException, RuleNotFoundException -) -from synapse.push.clientformat import format_push_rules_for_user +from synapse.http.servlet import parse_json_value_from_request from synapse.push.baserules import BASE_RULE_IDS +from synapse.push.clientformat import format_push_rules_for_user from synapse.push.rulekinds import PRIORITY_CLASS_MAP -from synapse.http.servlet import parse_json_value_from_request +from synapse.storage.push_rule import InconsistentRuleException, RuleNotFoundException + +from .base import ClientV1RestServlet, client_path_patterns class PushRuleRestServlet(ClientV1RestServlet): |