diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-02-23 18:29:26 +0000 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-02-23 18:30:45 +0000 |
| commit | f53fcbce9789186c1c42fe2f93ba46e3d8720b1b (patch) | |
| tree | 9d6e2f46a79a3cce0ef73b52509f9a2a7865375f | |
| parent | Fix code style warning (diff) | |
| download | synapse-f53fcbce9789186c1c42fe2f93ba46e3d8720b1b.tar.xz | |
Use cache.pop() instead of a separate membership test + del []
| -rw-r--r-- | synapse/storage/_base.py | 3 | ||||
| -rw-r--r-- | tests/storage/test__base.py | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py index 42edb56c36..da698cb3b8 100644 --- a/synapse/storage/_base.py +++ b/synapse/storage/_base.py @@ -75,8 +75,7 @@ def cached(max_entries=1000): defer.returnValue(ret) def invalidate(key): - if key in cache: - del cache[key] + cache.pop(key, None) wrapped.invalidate = invalidate wrapped.prefill = prefill diff --git a/tests/storage/test__base.py b/tests/storage/test__base.py index fb306cb784..55d22f665a 100644 --- a/tests/storage/test__base.py +++ b/tests/storage/test__base.py @@ -66,6 +66,13 @@ class CacheDecoratorTestCase(unittest.TestCase): self.assertEquals(callcount[0], 2) + def test_invalidate_missing(self): + @cached() + def func(self, key): + return key + + func.invalidate("what") + @defer.inlineCallbacks def test_max_entries(self): callcount = [0] |