summary refs log tree commit diff
path: root/synapse/storage/push_rule.py
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2015-02-05 15:32:45 +0000
committerKegan Dougal <kegan@matrix.org>2015-02-05 15:32:45 +0000
commitfc8bcc809d91c461eacb9ce466adbba29d814042 (patch)
treee85b9889a30926eef8f6a58744529431e3caea65 /synapse/storage/push_rule.py
parentFix unit tests. (diff)
parentGive server default rules the 'default' attribute and fix various brokenness. (diff)
downloadsynapse-fc8bcc809d91c461eacb9ce466adbba29d814042.tar.xz
Merge branch 'develop' into application-services
Diffstat (limited to 'synapse/storage/push_rule.py')
-rw-r--r--synapse/storage/push_rule.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/storage/push_rule.py b/synapse/storage/push_rule.py
index 27502d2399..30e23445d9 100644
--- a/synapse/storage/push_rule.py
+++ b/synapse/storage/push_rule.py
@@ -176,7 +176,7 @@ class PushRuleStore(SQLBaseStore):
         txn.execute(sql, new_rule.values())
 
     @defer.inlineCallbacks
-    def delete_push_rule(self, user_name, rule_id, **kwargs):
+    def delete_push_rule(self, user_name, rule_id):
         """
         Delete a push rule. Args specify the row to be deleted and can be
         any of the columns in the push_rule table, but below are the
@@ -186,7 +186,10 @@ class PushRuleStore(SQLBaseStore):
             user_name (str): The matrix ID of the push rule owner
             rule_id (str): The rule_id of the rule to be deleted
         """
-        yield self._simple_delete_one(PushRuleTable.table_name, kwargs)
+        yield self._simple_delete_one(
+            PushRuleTable.table_name,
+            {'user_name': user_name, 'rule_id': rule_id}
+        )
 
 
 class RuleNotFoundException(Exception):