summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2015-02-05 16:11:34 +0000
committerKegan Dougal <kegan@matrix.org>2015-02-05 16:11:34 +0000
commitc20281ee33b1bd18d78e7fcce0875a268d1369c9 (patch)
treeb701c91c67282600b9db3f5359ac0dd9b4df0edc /synapse
parentMerge branch 'develop' into application-services (diff)
parentpriority class now dealt with in namespaced rule_id (diff)
downloadsynapse-c20281ee33b1bd18d78e7fcce0875a268d1369c9.tar.xz
Merge branch 'develop' into application-services
Diffstat (limited to 'synapse')
-rw-r--r--synapse/rest/client/v1/push_rule.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/synapse/rest/client/v1/push_rule.py b/synapse/rest/client/v1/push_rule.py
index 80f116b1ed..d43ade39dd 100644
--- 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)