diff options
| author | Erik Johnston <erikj@jki.re> | 2017-04-28 14:17:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-28 14:17:13 +0100 |
| commit | 303326189161849af1a281a5597d997089b47543 (patch) | |
| tree | e6d3ed861395b958d269fc4e5fd2fd654dd5a3aa /synapse/storage/push_rule.py | |
| parent | Merge pull request #2163 from matrix-org/erikj/fix_invite_state (diff) | |
| parent | Remove unused import (diff) | |
| download | synapse-303326189161849af1a281a5597d997089b47543.tar.xz | |
Merge pull request #2080 from matrix-org/erikj/filter_speed
Speed up filtering of a single event in push
Diffstat (limited to 'synapse/storage/push_rule.py')
| -rw-r--r-- | synapse/storage/push_rule.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/storage/push_rule.py b/synapse/storage/push_rule.py index cbec255966..353a135c4e 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.items() if v is not None} + rules_by_user = {k: v for k, v in rules_by_user.iteritems() if v is not None} defer.returnValue(rules_by_user) @@ -398,7 +398,8 @@ 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 |