Merge branch 'develop' into application-services

2015-02-05 16:11:34 +00:00 · 2015-02-05 16:11:34 +00:00 · c20281ee33
parent fc8bcc809d a93fa42bce
commit c20281ee33
1 changed files with 0 additions and 4 deletions
--- a/synapse/rest/client/v1/push_rule.py
+++ b/synapse/rest/client/v1/push_rule.py
@ -82,10 +82,6 @@ class PushRuleRestServlet(ClientV1RestServlet):
    @defer.inlineCallbacks
    def on_DELETE(self, request):
        spec = _rule_spec_from_path(request.postpath)
-        try:
-            priority_class = _priority_class_from_spec(spec)
-        except InvalidRuleException as e:
-            raise SynapseError(400, e.message)

        user, _ = yield self.auth.get_user_by_req(request)