diff options
| author | Erik Johnston <erik@matrix.org> | 2017-05-08 13:07:41 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-05-08 13:07:41 +0100 |
| commit | 78f306a6f70552672f8c70171b2d9d79f20f8f8d (patch) | |
| tree | ed9bdff4e0837e2220b66cec398736a94478cea6 /synapse/storage/push_rule.py | |
| parent | Merge pull request #2192 from matrix-org/kegan/simple-http-client-timeouts (diff) | |
| download | synapse-78f306a6f70552672f8c70171b2d9d79f20f8f8d.tar.xz | |
Revert "Speed up filtering of a single event in push"
This reverts commit 421fdf74609439edaaffce117436e6a6df147841.
Diffstat (limited to 'synapse/storage/push_rule.py')
| -rw-r--r-- | synapse/storage/push_rule.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/storage/push_rule.py b/synapse/storage/push_rule.py index 353a135c4e..cbec255966 100644 --- a/synapse/storage/push_rule.py +++ b/synapse/storage/push_rule.py @@ -188,7 +188,7 @@ class PushRuleStore(SQLBaseStore): user_ids, on_invalidate=cache_context.invalidate, ) - rules_by_user = {k: v for k, v in rules_by_user.iteritems() if v is not None} + rules_by_user = {k: v for k, v in rules_by_user.items() if v is not None} defer.returnValue(rules_by_user) @@ -398,8 +398,7 @@ class PushRuleStore(SQLBaseStore): with self._push_rules_stream_id_gen.get_next() as ids: stream_id, event_stream_ordering = ids yield self.runInteraction( - "delete_push_rule", delete_push_rule_txn, stream_id, - event_stream_ordering, + "delete_push_rule", delete_push_rule_txn, stream_id, event_stream_ordering ) @defer.inlineCallbacks |