summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2020-10-16 16:14:42 +0100
committerGitHub <noreply@github.com>2020-10-16 16:14:42 +0100
commit995cc615a01bb11b70dbf8fdd0eb7f8b3d1fdc1e (patch)
treed4f28d7fc7b062bb5ec0f0499169ea01209cb3d5
parentchangelog (diff)
downloadsynapse-995cc615a01bb11b70dbf8fdd0eb7f8b3d1fdc1e.tar.xz
Apply suggestions from code review
Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com>
-rw-r--r--synapse/push/push_rule_evaluator.py2
-rw-r--r--synapse/util/caches/lrucache.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/push/push_rule_evaluator.py b/synapse/push/push_rule_evaluator.py
index 854ffd625e..2ce9e444ab 100644
--- a/synapse/push/push_rule_evaluator.py
+++ b/synapse/push/push_rule_evaluator.py
@@ -187,7 +187,7 @@ class PushRuleEvaluatorForEvent:
 # Caches (string, is_glob, word_boundary) -> regex for push. See _glob_matches
 regex_cache = LruCache(
     50000, "regex_push_cache"
-)  # type: LruCache[Tuple[str, bool, bool],Pattern]
+)  # type: LruCache[Tuple[str, bool, bool], Pattern]
 
 
 def _glob_matches(glob: str, value: str, word_boundary: bool = False) -> bool:
diff --git a/synapse/util/caches/lrucache.py b/synapse/util/caches/lrucache.py
index 0eed53d3f4..1a2c2d4c0b 100644
--- a/synapse/util/caches/lrucache.py
+++ b/synapse/util/caches/lrucache.py
@@ -283,7 +283,7 @@ class LruCache(Generic[KT, VT]):
                 return value
 
         @overload
-        def cache_pop(key: KT, default: Literal[None] = None) -> Union[None, VT]:
+        def cache_pop(key: KT, default: Literal[None] = None) -> Optional[VT]:
             ...
 
         @overload