summaryrefslogtreecommitdiff
path: root/keymanager/src/leap
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-12-18 22:36:20 -0400
committerKali Kaneko <kali@leap.se>2013-12-18 22:36:20 -0400
commit6559c38b51c28245cdbb06641466defac607855b (patch)
treec5593daa3ff06de00f12fa9034cce3ce8aed8bb2 /keymanager/src/leap
parent183253c9a9d2e2cae8467c1c4115d129e9a49d65 (diff)
Do not memoize get_key, but a separate method.
In this way we can choose which calls to get from cache and we do not mess with the call from send_key
Diffstat (limited to 'keymanager/src/leap')
-rw-r--r--keymanager/src/leap/keymanager/__init__.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/keymanager/src/leap/keymanager/__init__.py b/keymanager/src/leap/keymanager/__init__.py
index 5b1d8d96..aa4e2e72 100644
--- a/keymanager/src/leap/keymanager/__init__.py
+++ b/keymanager/src/leap/keymanager/__init__.py
@@ -252,6 +252,12 @@ class KeyManager(object):
signal(proto.KEYMANAGER_DONE_UPLOADING_KEYS, self._address)
@memoized_method
+ def get_key_from_cache(self, *args, **kwargs):
+ """
+ Public interface to `get_key`, that is memoized.
+ """
+ return self.get_key(*args, **kwargs)
+
def get_key(self, address, ktype, private=False, fetch_remote=True):
"""
Return a key of type C{ktype} bound to C{address}.