summary refs log tree commit diff
path: root/synapse/push
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-10-01 15:07:33 +0100
committerRichard van der Hoff <richard@matrix.org>2020-10-01 15:07:33 +0100
commit8a8d01d732476b333d455583e39a43f2e3603b13 (patch)
tree0fc172389db743b5be38d3c43e42fae7d01fef76 /synapse/push
parentRevert "Temporary fix to ensure kde can contact matrix.org if stuff breaks" (diff)
parentMerge tag 'v1.21.0rc1' into develop (diff)
downloadsynapse-8a8d01d732476b333d455583e39a43f2e3603b13.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/push')
-rw-r--r--synapse/push/push_rule_evaluator.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/push/push_rule_evaluator.py b/synapse/push/push_rule_evaluator.py
index 709ace01e5..3a68ce636f 100644
--- a/synapse/push/push_rule_evaluator.py
+++ b/synapse/push/push_rule_evaluator.py
@@ -16,7 +16,7 @@
 
 import logging
 import re
-from typing import Any, Dict, List, Pattern, Union
+from typing import Any, Dict, List, Optional, Pattern, Union
 
 from synapse.events import EventBase
 from synapse.types import UserID
@@ -181,7 +181,7 @@ class PushRuleEvaluatorForEvent:
 
         return r.search(body)
 
-    def _get_value(self, dotted_key: str) -> str:
+    def _get_value(self, dotted_key: str) -> Optional[str]:
         return self._value_cache.get(dotted_key, None)