diff options
| author | Erik Johnston <erik@matrix.org> | 2017-03-13 09:59:54 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-03-13 09:59:54 +0000 |
| commit | 672dcf59d3f9da12da43a77e316e2eec76d3ee4c (patch) | |
| tree | 9186644b06ef01e609ca018e02100ceecf0f3ea4 /synapse/util | |
| parent | Merge tag 'v0.19.3-rc1' into release-v0.19.3 (diff) | |
| parent | Revert "Support registration & login with phone number" (diff) | |
| download | synapse-672dcf59d3f9da12da43a77e316e2eec76d3ee4c.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.19.3
Diffstat (limited to 'synapse/util')
| -rw-r--r-- | synapse/util/caches/expiringcache.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/synapse/util/caches/expiringcache.py b/synapse/util/caches/expiringcache.py index 2987c38a2d..cbdde34a57 100644 --- a/synapse/util/caches/expiringcache.py +++ b/synapse/util/caches/expiringcache.py @@ -100,6 +100,13 @@ class ExpiringCache(object): except KeyError: return default + def setdefault(self, key, value): + try: + return self[key] + except KeyError: + self[key] = value + return value + def _prune_cache(self): if not self._expiry_ms: # zero expiry time means don't expire. This should never get called |