summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-01-17 14:43:32 +0000
committerErik Johnston <erik@matrix.org>2017-01-17 14:43:32 +0000
commit37b4c7d8a94203f790c0db408c114ec0004a2cc8 (patch)
tree81d64cac3dc43ab632400e3a76610ca5cbc4d2e7 /synapse
parentMerge pull request #1812 from matrix-org/erikj/state_auth_splitout_split (diff)
downloadsynapse-37b4c7d8a94203f790c0db408c114ec0004a2cc8.tar.xz
Fix typo in return type
Diffstat (limited to 'synapse')
-rw-r--r--synapse/util/caches/descriptors.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/util/caches/descriptors.py b/synapse/util/caches/descriptors.py

index a9ea97fd46..675bfd5feb 100644 --- a/synapse/util/caches/descriptors.py +++ b/synapse/util/caches/descriptors.py
@@ -178,9 +178,8 @@ class Cache(object): self.sequence += 1 self.cache.del_multi(key) - val = self._pending_deferred_cache.pop(key, None) - if val is not None: - entry_dict, _ = val + entry_dict = self._pending_deferred_cache.pop(key, None) + if entry_dict is not None: for entry in iterate_tree_cache_entry(entry_dict): entry.invalidate()